diff --git a/Manifest b/Manifest
index 33d491c9c00c..f98608d07af8 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29626 BLAKE2B 492334ce1396be6c30f3d8fa7f2178b79c09c8899ae58b1d33520b145f9b3ea551cbc88b1643265aae96cfdfaa15d85ba6df2b333b8b5f9926d1d537f6db1553 SHA512 29513aa1767395f83a5e5c350824c8a83c3ff58424d2f1d0f2b48741e51b4ec1f7a32a86d64cca6d8ca3baf508062afa93b7ece70a1d2aac6ee646a9b01ac39b
-TIMESTAMP 2022-05-06T16:09:48Z
+MANIFEST Manifest.files.gz 29616 BLAKE2B d8ad3682587dfaa8853520564f80e5744182cc4362da0379fe6470d783337510e493991bfe9f37f1292a9c7734e67e04bb0cec01a0232d983b16ee030d404951 SHA512 c97b602df6c684d66451edc8e66975201d1b469d098ec55530a41d97b931ff3c2632510cfbda74c184f96c41a44a645127ef2c87faccc171e92b7cd3439af31a
+TIMESTAMP 2022-05-07T08:09:47Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKSBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmJ1SExfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmJ2KUtfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA29g/yA3P/L+SKbO4xOu2NCOuimmJCpzewI7FgA8Y5tDwd8aQFr/FfDhqPNvzC
-LANuNCEiXNV5PYNYcFVDbnY9dFv+oSQl60CX6NQBjdKKy6KEdVogVRju6ufkCQBA
-D+PJMKev0lwLyJ6hszaTUOJl16KAE/IG9ThUmcSQ9ZqLH74E2z51tOzX6Wzy9ud7
-8x2beBCzar+jwgTQ53cz0dOwbtoZQVgacBFHJoRmq+DuLZXfXaGglEhmikAvdB7I
-8dUrrHi2mXZds5J6dMLSYbWoahH8GWcGeh+1Rb7P98gU1upsfQOfMulq2PAHB/8V
-GBCEcX8POtpce6L1wA8tmSQJMIcg9PGZSSWxg3hmx+Yu4yPRXV5FLHBAf7pRu3Rj
-vxfLFfP6LDUp7iz2I3N0D+IayTJsbEGRFPiDnC0d44K9I9hDCvNZhkWpIsk2eOaO
-z9Ed0Szr6eVdQAIMU9pYIg9AQ78CpkHvbSL+d2f5VrUP7v7bs6gOGa2mKEemLmXE
-Fpi60RbiONWXxA5KJFJ+LlNcgPlI/Pm8xICOs2Nk8XoGPSZgn5YnsvhwZUTVpagl
-/Jj9+iYgz+W7f7LdhX/EQFkUibFfhoS8JepeThWnZg00gmh6udVmCXOy15PlZxvd
-QwadA1ZPH94Fa4MTrdTYkKAHDaQ4bj0XhpxFGmLWTfSINrtWsw==
-=D9Nu
+klAHGg/+JThRPaVHEyR9TOWmQVCgQ7cNzgSZ9PaphuFB/1oOJscCVdCT7Uz682oD
+NNfc+8OBAnFjH9Z5Bxoq1yYbVn46FXUkDJzYcH88zM/hDxYyFNfTRo8N0nhC0bsv
+iaBcyyUZJEVTKYQ/ns2PNat20BJSWdchVVCC+PczTMqDehHWKfUaZPpyu8ckaeX4
+a/g9/6Qr8mXRgYDDfbRGqCzqPCt9FsVvfAYUOkN3SQCC1MIZpaqGT9596+RIFqZy
+2skCqS7//+PaWzedwIsdE+WmvXhnA2Jy1qjg19Makow7mgNoLyHNiziMC+uijh1o
+Dkh1RqigNqK3k4FPmGoQA2pGXt1wmgUR8mE2c3Eq5gDhLWhCmV3MTIRIZ2HDbEZf
+XMQTy1YTjqmtWMOscc0lnbvlUA+G9D28QKAMUS+bz0oA5qZpYATmpVIyyZdruC/P
+ZXSLqlCvi+dspch6wS0QxRC2nxZOpVoarvhYk8wCxO3+7aESEshHzn+kh134+i8W
+LRnStyXvynU0cp3m3tLxi0ZOjH1Aqs+cny5hhv7Dr0L8HIefsIDbmsLc8VGgrin/
+WgDQ5f1AoXSd7VmWT9JPeRj9myNjNpTwMczGnw1wK1YcoCMSW5Zjv+xFitRmdcnP
+Ail0nzsooV5lYLiC7Go5yBE8cOVNJZ9zP3OV0APvdpX39rePeis=
+=8pwA
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 6cd4e1ff42cd..78fc6b9ed76c 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 5e84e7158870..e0cbf4c52a84 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/gerbera/Manifest b/acct-group/gerbera/Manifest
index 6a4d80e70bba..e450079b36f8 100644
--- a/acct-group/gerbera/Manifest
+++ b/acct-group/gerbera/Manifest
@@ -1,2 +1,2 @@
 EBUILD gerbera-0-r1.ebuild 192 BLAKE2B 18aeb3338c5d555aa3a540d919c34bd62c40ef60d495572bada0d6bc03ee0262649f65301529945bf56409b7e50f2b0dc5e70cfc0cdb9f73ec1688f1b0adb781 SHA512 826d28344629898d17f21dde201235ff3e3b366683e96e4824571b7c736c5674e888ee872054655ad0c74167e487af9858b876ce595f7a35cb445f53b1888cbe
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
+MISC metadata.xml 406 BLAKE2B 6be52a743657b969bb47047966f9220e0c095142868dbe3560aa2e55e16c6a078658a2c54b990f907e5fa0b24f15d3aab7901cfccd78b39aa00393f44e1ea841 SHA512 4a2559a1cae4a2779e48114bcb08ce6d2f1c2b5587d0296f20172a24c7bcffd54f93bcd67fbf0529ec01ff05384e26c194d25d333c63f5318ee0cadd06b7944c
diff --git a/acct-group/gerbera/metadata.xml b/acct-group/gerbera/metadata.xml
index 115e9d64a669..dbd6bb4f0ed4 100644
--- a/acct-group/gerbera/metadata.xml
+++ b/acct-group/gerbera/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>christian.tietz@mailbox.org</email>
+		<name>Christian Tietz</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 562bc3212bf4..7950e37d5d4d 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/gerbera/Manifest b/acct-user/gerbera/Manifest
index 5957109a66dd..ffc2564a4d56 100644
--- a/acct-user/gerbera/Manifest
+++ b/acct-user/gerbera/Manifest
@@ -1,2 +1,2 @@
 EBUILD gerbera-0-r1.ebuild 276 BLAKE2B 5c613b2015ec89ec15facfdac4e541baf86f87b15c0d3f587d00bc0a4609cef952a9ff8ed7db4569ac63572ac7fd89cc98c3f86d8c2d13ec88b756aab55793bd SHA512 11f48b299593a11250ceeb1bc7a9a1bb6dc75606a5adf070d3e88f15d3fd5ef221b15236cbf14ef554c01bb6e23ba9dbfe51e7fe9b5da87a1bdd6c8be798e34c
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
+MISC metadata.xml 406 BLAKE2B 6be52a743657b969bb47047966f9220e0c095142868dbe3560aa2e55e16c6a078658a2c54b990f907e5fa0b24f15d3aab7901cfccd78b39aa00393f44e1ea841 SHA512 4a2559a1cae4a2779e48114bcb08ce6d2f1c2b5587d0296f20172a24c7bcffd54f93bcd67fbf0529ec01ff05384e26c194d25d333c63f5318ee0cadd06b7944c
diff --git a/acct-user/gerbera/metadata.xml b/acct-user/gerbera/metadata.xml
index 115e9d64a669..dbd6bb4f0ed4 100644
--- a/acct-user/gerbera/metadata.xml
+++ b/acct-user/gerbera/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>christian.tietz@mailbox.org</email>
+		<name>Christian Tietz</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/acct-user/miniflux/Manifest b/acct-user/miniflux/Manifest
new file mode 100644
index 000000000000..05d4a862a29d
--- /dev/null
+++ b/acct-user/miniflux/Manifest
@@ -0,0 +1,2 @@
+EBUILD miniflux-0.ebuild 238 BLAKE2B 01e2fe4fd3a95de3cb13234d89427968255e40372b2193d6a357ee6a587d5b8cc8bba968826e61a6c325c2da1ddc002adf0dc07c40353f3fdf14129541380b69 SHA512 02599dd8d9bf95f29087aec2c77b989654391b0d6fb68366b2d6c1e2f31f280758852aea2fae61ea601bd20b7949f22c2dfea77b0935a5aeb5b00103cbf1706e
+MISC metadata.xml 253 BLAKE2B 894a7b03d1a84d9f92bf6ee4d3f48a672a8cc36c505763b02c63280a8b6655aebce347245da9505078457167c207380cd8d5a8dd4ce31a48cac2c1b7a1d31d8d SHA512 0ac515844f89835ebb3acc9b771e502be5cf81e9eee85f00da8a20d51ec2b92d6874ca1412421b46b11ce2387abccae3520a0ba0f56ce044b487e6c3d8eab4d9
diff --git a/acct-user/miniflux/metadata.xml b/acct-user/miniflux/metadata.xml
new file mode 100644
index 000000000000..4b2f40cad64c
--- /dev/null
+++ b/acct-user/miniflux/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>concord@gentoo.org</email>
+		<name>Kenton Groombridge</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/miniflux/miniflux-0.ebuild b/acct-user/miniflux/miniflux-0.ebuild
new file mode 100644
index 000000000000..941a566e7309
--- /dev/null
+++ b/acct-user/miniflux/miniflux-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for www-apps/miniflux"
+ACCT_USER_ID=404
+ACCT_USER_GROUPS=( nobody )
+
+acct-user_add_deps
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index ad55859700ce..1a785e34bad2 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/edbrowse/Manifest b/app-accessibility/edbrowse/Manifest
index a858139bfc47..ecda679cdbcb 100644
--- a/app-accessibility/edbrowse/Manifest
+++ b/app-accessibility/edbrowse/Manifest
@@ -1,5 +1,5 @@
-AUX edbrowse-3.7.5.1-fno-common.patch 508 BLAKE2B b7908cf4019500da7df9f37c59e76b204227fefc16e068a1f5f3454ba6c33f30f7740cf89f6d6a9d193e79fd4b35d8f9584bc43b89c888b339742f5708bb8d27 SHA512 8adaa0621546b24b471f1afe5c93991876320170619dae5babe48099a3ef14286914136efb6643924be84ab5b6d7f709f4f5728d117d45f502db3befe3e4195d
-AUX edbrowse-3.7.5.1-manpage.patch 946 BLAKE2B 34ee1e54da6d1f980f8876bf43dff170136ce18fa216df14e9bb62b62bafb7d33b622a01df6fdc8db9af95e27d2149b0916e0e7834960e647919e1a237257cdb SHA512 5aa93520e1765db0cf38c9d85debed9e97f08f3941c104611850a5bb496d13882ab12d850eec509378ed8c878049c659af460a334eaa5dcce7ed48fa85d8b906
-DIST edbrowse-3.7.5.1.tar.gz 790742 BLAKE2B 7047cc2b1c7bc51aaa88f7a6aa981020ae80b6498bcb97f670646267dab94bab565b9ecc23c36f75d2653175917720dbb9e40a0f9bfd44251716669155e8de9e SHA512 ec217bf98334e8b493a1a80082cebfb11da9fa84d20d8b5f3f3286a78ae1dc6a2731c578d000f9f0f19d3dcbec9aa2c3e2a6b5b35f7ea7672840b9bcd1c5c67a
-EBUILD edbrowse-3.7.5.1-r3.ebuild 896 BLAKE2B c8ef654c3a52fc5f85441d33ee21a93a2554e28fa8f6dc85c387a3e87374647df70e8d6c6d259fc963657c638f7371723bdc6ae3671bf23cfe8f8af757dc1638 SHA512 700c1b9595b877965146e05fdc45a0f7dfd28aaf78168c259eb04c2ba7c49c95374b1037277fe1dd18622ded12843aec1eaa7a339684f3a8ac4b0240a0541f93
+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
 MISC metadata.xml 340 BLAKE2B 13c88efa300cbf9a242554fa41b530a764b874060608cc3720ce7e835a3fff28524efb121270bc80a5ef8aeac04e1a0b51ac5eb421c7173b9896b9c8fa56e02f SHA512 03dd5a0561636f582985dc98b8d1b37a268f6d7a4109844be462066cae2162f53f8f09dd3d63f5a87e188c6754297b9daca190e481cd323ab6c9c045e8c33cc2
diff --git a/app-accessibility/edbrowse/edbrowse-3.7.5.1-r3.ebuild b/app-accessibility/edbrowse/edbrowse-3.7.5.1-r3.ebuild
deleted file mode 100644
index 5fc5f1ffa3c1..000000000000
--- a/app-accessibility/edbrowse/edbrowse-3.7.5.1-r3.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
-
-inherit cmake
-
-DESCRIPTION="Combination editor, browser, and mail client that is 100% text based"
-HOMEPAGE="http://edbrowse.org"
-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-lang/duktape:=
-	dev-libs/libpcre:=
-	net-misc/curl
-	sys-libs/readline:=
-	odbc? ( dev-db/unixODBC )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fno-common.patch
-	"${FILESDIR}"/${P}-manpage.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -i -e "s:/usr/share/doc/edbrowse:/usr/share/doc/${PF}:" CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EDBR_ODBC=$(usex odbc)
-	)
-	cmake_src_configure
-}
diff --git a/app-accessibility/edbrowse/edbrowse-3.8.2.1-r1.ebuild b/app-accessibility/edbrowse/edbrowse-3.8.2.1-r1.ebuild
new file mode 100644
index 000000000000..d9e6b8f22449
--- /dev/null
+++ b/app-accessibility/edbrowse/edbrowse-3.8.2.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+QUICKJS_HASH=2788d71e823b522b178db3b3660ce93689534e6d
+QUICKJS_SHORT=2788d71
+QUICKJS_S="${WORKDIR}/quickjs-${QUICKJS_HASH}"
+QUICKJS_P="quickjs-${QUICKJS_SHORT}"
+
+DESCRIPTION="Combination editor, browser, and mail client that is 100% text based"
+HOMEPAGE="https://edbrowse.org"
+SRC_URI="https://github.com/CMB/edbrowse/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/bellard/quickjs/archive/${QUICKJS_HASH}.tar.gz -> ${QUICKJS_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="odbc"
+
+RDEPEND="
+	>=app-text/htmltidy-5.0.0:=
+	dev-libs/libpcre2:=
+	net-misc/curl
+	sys-libs/readline:=
+	odbc? ( dev-db/unixODBC )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	sys-apps/ed
+	virtual/pkgconfig"
+
+	PATCHES=(
+		"${FILESDIR}/${P}"-respect-ldflags.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}"
+	emake -C src QUICKJS_DIR="${QUICKJS_S}" STRIP=
+}
+
+src_install() {
+	dobin src/edbrowse
+	newman doc/man-edbrowse-debian.1 edbrowse.1
+	DOCS="doc/sample*"
+	HTML_DOCS="doc/*.html"
+	einstalldocs
+}
diff --git a/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-fno-common.patch b/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-fno-common.patch
deleted file mode 100644
index bf9fa08245da..000000000000
--- a/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/eb.h
-+++ b/src/eb.h
-@@ -287,7 +287,7 @@ extern char *sslCerts;		/* ssl certificates to validate the secure server */
- extern int verifyCertificates;	/* is a certificate required for the ssl connection? */
- extern int displayLength;	// when printing a line
- extern int formatLineLength;	// when formatting html
--bool formatOverflow;
-+extern bool formatOverflow;
- extern int webTimeout, mailTimeout;
- extern uchar browseLocal;
- extern bool sqlPresent;		/* Was edbrowse compiled with SQL built in? */
diff --git a/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-manpage.patch b/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-manpage.patch
deleted file mode 100644
index f0d667669113..000000000000
--- a/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-manpage.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -249,19 +249,7 @@ if (UNIX)
-     endif()
-     # copy to build dir
-     configure_file( ${UnixManFile} ${CMAKE_BINARY_DIR}/edbrowse.1 )
--    # find 'gzip' - warn if not...
--    find_program(GZIP_EXE gzip PATHS /bin )
--    if (GZIP_EXE)
--        # gzip it in place
--        execute_process(COMMAND ${GZIP_EXE} -f "edbrowse.1"
--            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
--            INPUT_FILE edbrowse.1
--            OUTPUT_FILE edbrowse.1.gz )
--        # install it
--	install(FILES ${CMAKE_BINARY_DIR}/edbrowse.1.gz DESTINATION ${UnixManDir})
--    else ()
--        message(WARNING "Unable to locate 'gzip'! No man page...")
--    endif ()
-+    install(FILES ${CMAKE_BINARY_DIR}/edbrowse.1 DESTINATION ${UnixManDir})
-     # install user guide
-     install(FILES doc/usersguide.html doc/usersguide_fr.html doc/sample.ebrc doc/sample_fr.ebrc doc/sample_it.ebrc DESTINATION ${UnixDocDir})
- endif ()
diff --git a/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-respect-ldflags.patch b/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-respect-ldflags.patch
new file mode 100644
index 000000000000..3b511e1d2b38
--- /dev/null
+++ b/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-respect-ldflags.patch
@@ -0,0 +1,13 @@
+diff --git a/src/makefile b/src/makefile
+index d65369a3..410d3e9d 100644
+--- a/src/makefile
++++ b/src/makefile
+@@ -31,7 +31,7 @@ endif
+ CFLAGS += $(DEBUGFLAGS)
+ 
+ #  Libraries and linker flags for edbrowse.
+-LDFLAGS = $(STRIP) $(LINKER_LIBS) -lpthread -lm
++LDFLAGS += $(STRIP) $(LINKER_LIBS) -lpthread -lm
+ 
+ # LDFLAGS for quickjs loading.
+ QUICKJS_LDFLAGS = $(QUICKJS_DIR)/libquickjs.a -ldl
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 45a81ff7684d..8adef6fbbeb0 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 67ce92a452a1..b2f5e3e211b7 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -58,5 +58,5 @@ EBUILD salt-3003-r1.ebuild 6580 BLAKE2B ba2d5c5a2461694213918dc4d7cb88600235b1b1
 EBUILD salt-3003.3-r1.ebuild 6842 BLAKE2B d273b5b3a717022a75cc83563f9d0f8412c5250f062312be30c36560faf1250ca64382b4cc4f4e180196217b97158090dd7593a4f4e450904840f5a7d4c88104 SHA512 46aa981c49279c984d622bd38782099919845fa47597eb343a8a40bdcbf76ac29e1377c09ee4c33b6d6930e789c34bafeef308094adc873646be5805b7710f6f
 EBUILD salt-3003.3.ebuild 6801 BLAKE2B 5146a9a20ca1de9ef167f896df8cafea100a1b5245d747aea685a6811151c3909040c3cf53d80ed5eb7359e76914a5fdf94ad8af8d643995d46c727d9163cc66 SHA512 95a055ce3a69a358bfdd221f139b86964a7ce5ea18d3f12b9270bcb03f4873cdab55b738338165b785d039f869096928758a8ccb1c0c6a87c3e1897da0a89ae6
 EBUILD salt-3003.4-r1.ebuild 6933 BLAKE2B c99f429003c7992c9b9271413ce4929c2e4a3fb49d3dae818a37a7e9253165cce99625a4c298cd6065781564eb1b838edc5cfca437dbc7103878131bc5de1671 SHA512 52719d14b8bbdd55c4f4aff007733cf5a889339d6187caeb5c57a5a2bd53b999b910dda0213db50fc5224f0e01f9380ada63c1e8f344530ea60d6f6cbb9498d0
-EBUILD salt-3004.1-r4.ebuild 7039 BLAKE2B 1b63de4a1c9414e21501e08381285eb89c64612f014f40e110ad1454dc4f0ada0ffe3109cdf40aa7696f1d2505767033b5434d29a3c0bc76ddda0bd97807e4c2 SHA512 6e2fcac3e64fc8c69913f4dac8dc824e0b742d150976f676be2cbc736df2ecaba343c4eba061f66677edddd12709fab6071a145c14fdfa0497cc81846498bf7c
+EBUILD salt-3004.1-r4.ebuild 7037 BLAKE2B b7403a697abe6d6c327e3df54723f7604504adca6b9411b5a9ae16a354d55c7360040dec12475fbdcef18a50d4bf29f0d48575b766459ffe4cefd8da65bc50d4 SHA512 d6f6b0583edb0c85de6315a7a679010b7409a594eeb709c61c17d579c1b4c0d9921059dc2f99f2bc92092266945ad24c83817615b84a36cd033ea4143268d522
 MISC metadata.xml 2362 BLAKE2B 60fd7a02823e610b4d12b1d4c6a066cf16f8ef4094397553381d62bc027715164f02ccad4c86e431a30822d5c4c25e4eebd814f99e43b7a45bc08a3fd885cfee SHA512 4aa7549a76e69233949c68841bfcdba6630eeb78a507f20119469f7835a6532b737f41d117c09b1e4c7574f95dec759deacf5d5482be961755d63a19b9eee9a7
diff --git a/app-admin/salt/salt-3004.1-r4.ebuild b/app-admin/salt/salt-3004.1-r4.ebuild
index f70d9445491a..e33415b59625 100644
--- a/app-admin/salt/salt-3004.1-r4.ebuild
+++ b/app-admin/salt/salt-3004.1-r4.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-admin/tpm/Manifest b/app-admin/tpm/Manifest
new file mode 100644
index 000000000000..d1406ae26fef
--- /dev/null
+++ b/app-admin/tpm/Manifest
@@ -0,0 +1,4 @@
+DIST tpm-1.3.3.tar.gz 14623 BLAKE2B efff44b542cc5731c5e2b4527721161e3ad73088eb8ac5f46012dd7da823d67045994f64d830eef48a136fbc4fbb8df04235a10fc9d0e867a8ea2b3a01d1b01e SHA512 113ba21300d2a5fdfb1c058c3f496b004195b68576a832c5ad89b8baecd2d18660ba108e2e7a5ae68148dd60bdaacaee5f5024905b8fc07184a577e0837ae204
+EBUILD tpm-1.3.3.ebuild 555 BLAKE2B 19d3e1bebc06bc72a5a6a401262c2dfe4a734c9465466ca0fcc039b36068279340df80f9959c299889a409a9761ae9d58d0b3e30f1df61142b4d6f53938f210c SHA512 c2fd4eb235cdf8507b0dc82e8e9b79af0f6f2e5e3ec669b26fd26a1aec28e6e4fba89f3a785cbe668de39f1eba470f16c0a8072111b12d94769243f714232789
+EBUILD tpm-9999.ebuild 555 BLAKE2B 19d3e1bebc06bc72a5a6a401262c2dfe4a734c9465466ca0fcc039b36068279340df80f9959c299889a409a9761ae9d58d0b3e30f1df61142b4d6f53938f210c SHA512 c2fd4eb235cdf8507b0dc82e8e9b79af0f6f2e5e3ec669b26fd26a1aec28e6e4fba89f3a785cbe668de39f1eba470f16c0a8072111b12d94769243f714232789
+MISC metadata.xml 793 BLAKE2B be7b53660d81a145da5682bab4f84f3c732f2c735db9cf2c32daa5ae887677500aeaa28ec03997f1417a3d23118003f0087e4e98e1261301686e7e608d99c119 SHA512 65b07e08517e1955a5811fa942efe3c71362deff8b64a15f33968f4e12e8f4f1be9d44a450204a30f8cbefa1fdd5ff368f2fd3d9c6d556644263a2e89a308c80
diff --git a/app-admin/tpm/metadata.xml b/app-admin/tpm/metadata.xml
new file mode 100644
index 000000000000..40605a691828
--- /dev/null
+++ b/app-admin/tpm/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>orbea@riseup.net</email>
+		<name>orbea</name>
+	</maintainer>
+	<maintainer type="person" proxied="proxy">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<longdescription>
+		tpm is a tiny shell script which is heavily inspired and
+		largely compatible with pass(1). Just like pass it uses
+		gpg2(1) to securely store your passwords, the major difference
+		between pass and tpm is that the latter is a lot more minimal.
+		Furthermore, tpm is written entirely in POSIX shell.
+	</longdescription>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">nmeum/tpm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/tpm/tpm-1.3.3.ebuild b/app-admin/tpm/tpm-1.3.3.ebuild
new file mode 100644
index 000000000000..dd2b55edef2e
--- /dev/null
+++ b/app-admin/tpm/tpm-1.3.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Tiny password manager"
+HOMEPAGE="https://github.com/nmeum/tpm"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/nmeum/${PN}.git"
+else
+	SRC_URI="https://github.com/nmeum/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND="app-crypt/gnupg"
+BDEPEND="dev-lang/perl"
+
+src_install() {
+	emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
+}
diff --git a/app-admin/tpm/tpm-9999.ebuild b/app-admin/tpm/tpm-9999.ebuild
new file mode 100644
index 000000000000..dd2b55edef2e
--- /dev/null
+++ b/app-admin/tpm/tpm-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Tiny password manager"
+HOMEPAGE="https://github.com/nmeum/tpm"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/nmeum/${PN}.git"
+else
+	SRC_URI="https://github.com/nmeum/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND="app-crypt/gnupg"
+BDEPEND="dev-lang/perl"
+
+src_install() {
+	emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
+}
diff --git a/app-admin/xstow/Manifest b/app-admin/xstow/Manifest
index ac4726a11a39..c9ca92b40c6d 100644
--- a/app-admin/xstow/Manifest
+++ b/app-admin/xstow/Manifest
@@ -1,5 +1,7 @@
 AUX 99xstow 65 BLAKE2B c3d3dae69e0ed5251a996ddfb164795718974e1c2464176e680373fab25ceeb8a22392ac8de0dd489462e28bc48512c151f3f438ddc7f9bd093d5c63b46ba29b SHA512 0ade954fc07ba98be74d79e8ce842fc4e3e12f83d59f76eb78810251cc9e1612d963401be99f38002d94a2a32c9c2a32429f73d7ee69e97c12f6a05db14a3476
+AUX xstow-1.0.1-gcc12-clang.patch 1016 BLAKE2B e14b1e6af041fa6c4f0bde9466a7cbba0def66e064cf05eb015643f83395b14e12e9556ae945f3cf4d4e1d08df43b8d334b30bef10f1f3b938d27e54f3fe1114 SHA512 e5861676c5093219048cba1d63c62d3e2c1768553277aba17fad472799c312d9deb54a9864174e30dbb3a72eb923970dcc0dc150b96977da187ced8e8628888a
 AUX xstow-1.0.1-ncurses.patch 1070 BLAKE2B 58782b144bf997d88e1480f7743afb8d6dc2e814a4a412bb0d0ebf8cc83ae0d1aab5605228e7a6228e0aec6b8fca83104249e80e7f2406aafe2f9ab8408cf6eb SHA512 63fce626ad5b376a5aa2d335fdd4d73ce3a1b7fccc5a6ff5ab92182d6f3ca40417926b9d35f3447ed73f386d3022d6dc81ec39a2f790fea46b681d344fdad389
 DIST xstow-1.0.2.tar.bz2 151622 BLAKE2B 45123c2cb018605c2e47940707384ea1824ddf4f542cfad6a73bfc3559803ca6ec7811252221ad80125e1821cac6d65bcc106b4acf294c4fa453e8043c78cf04 SHA512 319dcd57290fcee9fd66811e64af73ddab8abb11d47c0cb79d3e11f1ecdf18ab9511b3a0690621061d2613193cd4895f3bddb3d741159c23c14d278a8a8bf9dd
+EBUILD xstow-1.0.2-r1.ebuild 1283 BLAKE2B d808e405f774c50dd5939076c87fc8827267dc4933e76088bc3b136d2017045c77cf1d26eabd043a02038240d0164ac533634581ea7ece0766f43fd7a07268f9 SHA512 ed6510d9b59242f42694989461807a70035098b572be64aff02f2cffc214a154b31036c65473a1e5675e5ead49b6d822e39998d6e277d6a35d42a776dbc63c33
 EBUILD xstow-1.0.2.ebuild 1232 BLAKE2B b4c313abba4222528ce1f7f92c3a75386ff82344089399706516b0820298a0c96e65296dbb1b72625cc782afb3c88bb5447ec4e2e15f2636a2d9aee7fcc41129 SHA512 cf5b480a23372a207f9c779c1de2c766b1adce38446e1ab8d7dd9d58eabeb55162a4d63abda6ad4e5234b3cc6d9155696171b0c8dceec77e296c268d2b24aafc
 MISC metadata.xml 243 BLAKE2B a06cbed4fff7b21d4f77f230217c539a20af83bd7e33bf636528a509eaef9becdcf3057d475ddcce21ec4ff77e8b0b342dc542ea000e4030100f9a01f74beedf SHA512 5fde535be5478318f25eee6c74260f2bbb525fd1e9dea4e5bb2a0ef079e4f07d66bdd3de5bd6ddf2608f9d82b6c29f6bdfe3ac62a5d9d0c9539f661dc084f1ad
diff --git a/app-admin/xstow/files/xstow-1.0.1-gcc12-clang.patch b/app-admin/xstow/files/xstow-1.0.1-gcc12-clang.patch
new file mode 100644
index 000000000000..982d6bc5cb12
--- /dev/null
+++ b/app-admin/xstow/files/xstow-1.0.1-gcc12-clang.patch
@@ -0,0 +1,33 @@
+https://svnweb.freebsd.org/ports/head/sysutils/xstow/files/patch-src__string_utils.h?revision=319588&view=co&pathrev=319588
+https://svnweb.freebsd.org/ports/head/sysutils/xstow/files/patch-src__leoini.h?revision=319588&view=co&pathrev=319588
+https://bugs.gentoo.org/840359
+https://bugs.gentoo.org/729114
+
+--- a/src/leoini.h
++++ b/src/leoini.h
+@@ -260,11 +260,9 @@
+ 
+     if( start == std::string::npos ||
+ 	end == std::string::npos )
+-      s = "";
+-    else
+-      s = s.substr( start+1, start-end -1 );
++      return s2x<A>("");
+ 
+-    return s2x<A>(s);
++    return s2x<A>(s.substr( start+1, start-end -1 ));
+   }
+ } // namespace Leo
+ 
+--- a/src/string_utils.h
++++ b/src/string_utils.h
+@@ -28,6 +28,9 @@
+ #  define STRSTREAM
+ #endif  
+ 
++typedef std::vector<std::string> vec_string;
++std::ostream& operator<<( std::ostream& out, const vec_string &v );
++
+ std::string toupper( std::string s );
+ std::string strip( const std::string& str, const std::string& what = " \t\n\0" );
+ bool is_int( const std::string &s );
diff --git a/app-admin/xstow/xstow-1.0.2-r1.ebuild b/app-admin/xstow/xstow-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..85b4c928574f
--- /dev/null
+++ b/app-admin/xstow/xstow-1.0.2-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Replacement for GNU stow with extensions"
+HOMEPAGE="http://xstow.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xstow/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ncurses"
+
+DEPEND="ncurses? ( sys-libs/ncurses:0= )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.1-ncurses.patch
+	"${FILESDIR}"/${PN}-1.0.1-gcc12-clang.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with ncurses curses)
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}/html" install
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	# Create new STOWDIR
+	keepdir /var/lib/xstow
+
+	# Install env.d file to add STOWDIR to PATH and LDPATH
+	doenvd "${FILESDIR}"/99xstow
+}
+
+pkg_postinst() {
+	elog "We now recommend that you use /var/lib/xstow as your STOWDIR"
+	elog "instead of /usr/local in order to avoid conflicts with the"
+	elog "symlink from /usr/lib64 -> /usr/lib.  See Bug 246264"
+	elog "(regarding app-admin/stow, equally applicable to XStow) for"
+	elog "more details on this change."
+	elog "For your convenience, PATH has been updated to include"
+	elog "/var/lib/bin."
+}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 3691284f5b11..2fde75ea3ced 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/signing-party/Manifest b/app-crypt/signing-party/Manifest
index 66fec293a108..3200f6da2c58 100644
--- a/app-crypt/signing-party/Manifest
+++ b/app-crypt/signing-party/Manifest
@@ -1,5 +1,3 @@
-DIST signing-party_2.10.orig.tar.gz 222778 BLAKE2B b2225ba3038037a8f841e5f2ee8c5f08f3fe294e617c42396269aadf348965a17151bb31b11a76b2d84806e060cb0eb1093963f72e17bb5549ac6fbec0e332fb SHA512 82e51b91c282a72e9d16d920b87560c66aeafc0219e91615ea47d2f1a5df903fb459201f34368e6fa7ea1e2d2ca46a73096f30a068c8c35322af2f3ea256b269
 DIST signing-party_2.11.orig.tar.gz 224706 BLAKE2B 6ef03d9e7e5652b7da77facc3206d25de63958a56ef64c0393b9964e1653c099dc022be5c80a02041418aee9dcb74e4fc0c448198b1deade79e59372cb8308c0 SHA512 9a34bde415bf779859b48eaab12e5c6a1a3f08d0292cd5cd691518e398fe40a73b878926d3ea1ef12ccca40179933478d03ec16ec4d9200fb726aaade541505d
-EBUILD signing-party-2.10-r1.ebuild 2797 BLAKE2B 0ed8ba0f6cea19101471b9edc3df44e78753dcc69c03670d6ab4ccd0ffa45a75906d5914f889be4071f7f88441fae2f8797a1c9836d306f778679f902f958c6e SHA512 e18d0896f5a4a5947567e2b646bc2d061930b6b64e2e0f2835a6617da5b257008a3e1f92f1640c1a2d69af5fab95c3effe449ff9a30be831dac675f3304c3830
-EBUILD signing-party-2.11.ebuild 2800 BLAKE2B df7caa0bc9684fb37d2b0a138df51ea0e0bf4b5cb515c1cab0067b323ed2ad6847fb43a8e4df02e4d9310c8226d1755a41929291a525a9540613701409b19001 SHA512 3b9ad46879f57f94378cb9c17afbabfbd8f022e81351346a8dce9ed37256614eddae5bdf303a8b795c9c2e22c2520fb48bf894c3d20adae0a5049c01f1d8fcd2
+EBUILD signing-party-2.11.ebuild 2797 BLAKE2B 8637eb68c610eac572c95a43290ab24f3fff96098961b298c1bae95b6b4ca64ef362236627db0f0ccf29ef97a5a92b03221a6be18986d7ade8558599b0f45e2a SHA512 a1b0e215b6a2e1f772110ab9583206da6d2e4ece76d678d5f13f09047d99ab934d41fafe0fde45a90aa08e225749e55313285487ad3b8016019d856a04cabc52
 MISC metadata.xml 244 BLAKE2B 94b04f9b5ade506f66b25651b1fdabfaf11febaff3175956406893e90548e87145186ef43a617e24803bd22d9da3f90ea8d72cfea7847aea521974b3138e92ad SHA512 20225e64357a690e86df86aa4d784300459d28b775e3989f77fd31e752ef968de63e41b59bb3c78b331e817f9eceab6dd6ef01131451753a1b5d3a309770611a
diff --git a/app-crypt/signing-party/signing-party-2.10-r1.ebuild b/app-crypt/signing-party/signing-party-2.10-r1.ebuild
deleted file mode 100644
index 8cd2f3ebb114..000000000000
--- a/app-crypt/signing-party/signing-party-2.10-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs autotools
-
-DESCRIPTION="A collection of several tools related to OpenPGP"
-HOMEPAGE="https://salsa.debian.org/signing-party-team/signing-party"
-SRC_URI="mirror://debian/pool/main/s/signing-party/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND="dev-lang/perl
-	app-crypt/libmd"
-RDEPEND="${DEPEND}
-	>=app-crypt/gnupg-1.3.92
-	dev-perl/GnuPG-Interface
-	dev-perl/Text-Template
-	dev-perl/MIME-tools
-	net-mail/qprint
-	>=dev-perl/MailTools-1.62
-	dev-perl/Net-IDN-Encode
-	virtual/mailx
-	virtual/mta
-	|| (
-		dev-perl/libintl-perl
-		dev-perl/Text-Iconv
-		app-text/recode
-	)"
-
-src_prepare() {
-	default
-
-	# app-crypt/keylookup
-	rm -r keylookup || die
-	sed -i -e 's#keylookup/keylookup##' Makefile || die
-
-	# media-gfx/springgraph
-	rm -r springgraph || die
-
-	find . -name Makefile | xargs sed -i -e 's/CFLAGS:=/CFLAGS=/' -e 's/CPPFLAGS:=/CPPFLAGS=/' -e 's/LDFLAGS:=/LDFLAGS=/'
-
-	sed -i -e 's/autoreconf/true/g' keyanalyze/Makefile || die
-	pushd keyanalyze/pgpring || die
-	eautoreconf
-	popd || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CPPFLAGS="${CPPFLAGS}" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		STRIP=true
-}
-
-src_install() {
-	einstalldocs
-
-	# Check Makefile when a new tool is introduced to this package.
-	# caff
-	dobin caff/caff caff/pgp-clean caff/pgp-fixkey
-	docinto caff
-	dodoc caff/{README*,THANKS,TODO,caffrc.sample}
-	# gpgdir
-	dobin gpgdir/gpgdir
-	docinto gpgdir
-	dodoc gpgdir/{VERSION,LICENSE,README,INSTALL,CREDITS,ChangeLog*}
-	# gpg-key2ps
-	dobin gpg-key2ps/gpg-key2ps
-	docinto gpg-key2ps
-	dodoc gpg-key2ps/README
-	# gpglist
-	dobin gpglist/gpglist
-	# gpg-mailkeys
-	dobin gpg-mailkeys/gpg-mailkeys
-	docinto gpg-mailkeys
-	dodoc gpg-mailkeys/{example.gpg-mailkeysrc,README}
-	# gpgparticipants
-	dobin gpgparticipants/gpgparticipants
-	# gpgwrap
-	dobin gpgwrap/bin/gpgwrap
-	docinto gpgwrap
-	dodoc gpgwrap/{LICENSE,NEWS,README}
-	doman gpgwrap/doc/gpgwrap.1
-	# gpgsigs
-	dobin gpgsigs/gpgsigs
-	insinto /usr/share/signing-party
-	# keyanalyze
-	# TODO: some of the scripts are intended for webpages, and not really
-	# packaging, so they are NOT installed yet.
-	newbin keyanalyze/pgpring/pgpring pgpring-keyanalyze
-	dobin keyanalyze/{keyanalyze,process_keys}
-	docinto keyanalyze
-	dodoc keyanalyze/{README,Changelog}
-	# See app-crypt/keylookup instead
-	#dobin keylookup/keylookup
-	#docinto keylookup
-	#dodoc keylookup/NEWS
-	# sig2dot
-	dobin sig2dot/sig2dot
-	dodoc sig2dot/README.sig2dot
-	# gog-key2latex
-	dobin gpg-key2latex/gpg-key2latex
-	# See media-gfx/springgraph instead
-	#dobin springgraph/springgraph
-	#dodoc springgraph/README.springgraph
-	# all other manpages, and the root doc
-	doman */*.1
-	dodoc README
-}
diff --git a/app-crypt/signing-party/signing-party-2.11.ebuild b/app-crypt/signing-party/signing-party-2.11.ebuild
index 9b85ae41781d..b152b15cee90 100644
--- a/app-crypt/signing-party/signing-party-2.11.ebuild
+++ b/app-crypt/signing-party/signing-party-2.11.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/s/signing-party/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND="dev-lang/perl
 	app-crypt/libmd"
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index f1b941f8816c..57fbe466aa3c 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/gnucash-docs/Manifest b/app-doc/gnucash-docs/Manifest
index 87d20db616d6..36aa3ec4b312 100644
--- a/app-doc/gnucash-docs/Manifest
+++ b/app-doc/gnucash-docs/Manifest
@@ -1,6 +1,8 @@
+DIST gnucash-docs-4.10.1.tar.gz 83109980 BLAKE2B 1c7c14fe604b934a3a76c90822b2d6abd13fa81248be93269e90a09619ea5e145053933df1e6d7cd0578de0d4641ba1a5c87955452fdee1eba026843539ceb74 SHA512 b015071ae9cfcc65dfaae194ca3d8508345cdaaa6c6d955ba263b7b47ea5d9b6912807b0e8ad8988241184a8c380ba5c680c084130f61d0c040446efa5797f8c
 DIST gnucash-docs-4.4.tar.gz 62534210 BLAKE2B 0c3cdc3ccdf1cfb7a54e44dcde9ea10672cb312e6d6e083ae9bb65bc52b044e8559647a8491f6fa762d9bb84c33f22dd9cacb3a862548994bdc7c56b3e634aa9 SHA512 60e34af3fdb144fefc835d6497fd442daad1417c4e40f8b4fd8f66a37cd0cfa1d789aa03de435d4654ee2368a4b85e9b0cfba8eeef61829e0ca190a453a9abdc
 DIST gnucash-docs-4.5.tar.gz 71420078 BLAKE2B cf4cf6f62e0ce1c5f868f91b6452a531e14a4fb85c801a941e5b19a9a3e61593a248cc79c753e23d9fb40809f27194117d6e73c7723f9454c2c2d0658fcd77e0 SHA512 27fcb649ad813d2aa148b8a910a6d35fcb47e79b0c36e6b2456d733f8f969686234e090d128ccb4a2227c71385dfa9d9236606a3e9354923e128644ee0be137f
 DIST gnucash-docs-4.8.tar.gz 74862559 BLAKE2B da0496a5762bd3a7437272e1118f53e2dbb218bc8c8e960134ece3b10909c5673109e76dd195cdde320bd47849d43ad1068d21857ab288b57ff3d179fafe36ce SHA512 61be5ada80748350f5d72068a6c19cd5a5db6cd8b4500ed16febe5f53586d929b4843ac6b51ced78b381e26c8948beeb1cc48593d5263f906ba5b8f3fda47d2e
+EBUILD gnucash-docs-4.10.1.ebuild 1320 BLAKE2B b59c53c7f6973567a6e1a64093bbaa63e68982f8e1424999177b66ff1441a894edfbf93493f32eec61c3782094526d59b54aef5dc266637b83d1f31567da1f9e SHA512 c7c8fd54a5e05443685786370ee306c36fa3b2e7aa787c2a3e45af05df1f7588e69e11f3fb04ee18bec1a9d79b3d5d98d4a001090e5ae3c62b650325514f0524
 EBUILD gnucash-docs-4.4.ebuild 1285 BLAKE2B ecb63537a38a0bd44cc87e34d238b1f173330799aad9fad0908e940957dddff0305edbda67b0b06fac239776e375aecd3261e3f2765dec0cf6a94e965050247d SHA512 df0ed95b0f06a82ff9fda6f39229d8693676ea57699c9f1ef17ce19bb5e2801f342577e72c4e3cbd56c206b4e008f959147c3188b625a57c92c0cb3fe996f8ff
 EBUILD gnucash-docs-4.5.ebuild 1287 BLAKE2B bdcff301ee1ec3e3927bc7209579451b3ac63d76839c855cdb570902a0d87940686d7c197bcc5d88e2edd0e34e481d21bf6f6c4683a8c3d1664a17fae7f62710 SHA512 f128c1a98619845b0371acce1817f8d4c381e277d707d1ac154fd54364c5073a4afb14478f163cffc35c43860cab9cffe0eb825c746af6020b954ba32c6c4b39
 EBUILD gnucash-docs-4.8.ebuild 1278 BLAKE2B 8bd5708ce32c324d150d946b2e05eaab13ec7ef4866fa6d0dc66c01b4418c9a4d42ba81c2258f5ab01503fc113b519a9f577ab118d42dbdfa86373f41f4ed5e5 SHA512 2080f962dc989078c4e6f3b7e5a6f6d3b275a3500ebe9115c14a503d57caaadb34c9c6fbbbc77329b64e4be586151d7c2cadc51dddfa4e5a06fd455235b57604
diff --git a/app-doc/gnucash-docs/gnucash-docs-4.10.1.ebuild b/app-doc/gnucash-docs/gnucash-docs-4.10.1.ebuild
new file mode 100644
index 000000000000..70c40007a4bc
--- /dev/null
+++ b/app-doc/gnucash-docs/gnucash-docs-4.10.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with app-office/gnucash
+
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake optfeature
+
+DESCRIPTION="Documentation package for GnuCash"
+HOMEPAGE="https://www.gnucash.org/"
+SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+LOCALES=( de it ja pt )
+IUSE="${LOCALES[*]/#/l10n_}"
+
+BDEPEND="app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxml2
+	dev-libs/libxslt"
+
+src_install() {
+	local doc_type my_lang
+
+	for doc_type in manual guide; do
+		for my_lang in C ${L10N}; do
+			case ${my_lang} in
+				# Both help and guides translated
+				C|de|it|pt) ;;
+				ja|ru) # Only guides translated
+					if [[ ${doc_type} = "manual" ]] ; then
+						elog "Help documentation hasn't been translated for ${my_lang}"
+						elog "Will do English instead."
+						continue
+					fi
+					;;
+				*)
+					die "Invalid locale: $my_lang"
+					;;
+			esac
+
+			emake \
+				-C "${BUILD_DIR}/${doc_type}/${my_lang}" \
+				DESTDIR="${D}" \
+				install
+		done
+	done
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	optfeature "generating PDF files" dev-java/fop
+	optfeature "viewing the docs" gnome-extra/yelp
+}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index cfc7f5bce702..b0ac8e6cb327 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 125f4ee7c841..9c484e4fcfef 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -6,20 +6,18 @@ DIST emacs-24.5-patches-5.tar.xz 14796 BLAKE2B 3e097f9cdf96a8b0255ce69770f79259a
 DIST emacs-24.5.tar.xz 39759804 BLAKE2B aec253528038686822d1f8ed9a52dff276789ef7744053fc9b6176fceba4d4d8684fe979cf97e756b3feaf734d2377baef81f5efaa5450930a4e94d9f3bca355 SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677
 DIST emacs-25.3-patches-3.tar.xz 2828 BLAKE2B 9a367a545d889d2edf0ee95edb856a7367ec6c10ae6c6fe6b2b452f548184a2a721eb72c448f303a639d5210366c11cf64af33fa322496ff1fd6f7a7e995a154 SHA512 fd65b768be3e3b7b6e280324ff5dd9f790a1279775defea370be5a2555fd64c134c004723e0722331e32117901281dfa2ca2ba42ee4fb33037a3eb83617e222b
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
-DIST emacs-26.3-patches-1.tar.xz 1076 BLAKE2B 1218c9a69deae0e3a55e061bd0cd2ab2b7099c86ebe861cc0b3c61a6d7a0756dce13553c861c41a9d2943b5ae78f3c607f099663e90b504d349d2a0be0f34682 SHA512 0e989e760e08675fdedb2cfca39ce63255dd092af38e0dd7febebb54aba10f5a186e1d360edecec3a4dd0ccc480dcc4430b3b9a73bdc84f8dc977591c3da395e
 DIST emacs-26.3-patches-2.tar.xz 1780 BLAKE2B f5dc9d041ea8a07549a817a2b18f84c8a75dce1d53e8de7c6751d48e71e27ee5a3626688252e079917b50473d6b3963f191383050799d199223cdd594be24dbe SHA512 33c91a138e2c9ba3146e66dc03cf05a4baef48019b1ca5c487a56b15f561bf208d58b0f2dc7d250682b86437dce1ce5b050887c4a5ef44194c46fbb7a7346d16
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 DIST emacs-27.2-patches-3.tar.xz 7776 BLAKE2B c03947780518ebf86994b1af20cc24377094c55c783e3cbb0230da5ecb4c92613c4e6d599cefe51b297cc117e3a832c6b34365cc983da0630a9ca6f39b58d10e SHA512 a72af0dd47989b5e4ceecc48d8dfd1a362cdda17070a6a5a9c53c0448a7bceed3b27efd0dd78a0cbe3eb503015b1475cd52fc01c5aca10a52ad30635f385b190
 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156 SHA512 0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9
 DIST emacs-28.1.tar.xz 47699512 BLAKE2B 42a12bec2dc74f4838ae79b5589fb7439ff415d8ddd34f2ff7a8c503f909ddd4144ad35ae19c758d8627cfa9ed29276b326c5bec3853a77cd179e9fb17d22ad7 SHA512 c146ff7086aba49fa6c18adf4e485a59eb4c6525fddb9d385034446830b8bb0ac9e6fb76e7b6d94a9fddc41643415f36acad57a1ae16a841c97f61bc211459d9
 EBUILD emacs-18.59-r14.ebuild 4351 BLAKE2B 43b9d632623afd061f1259166faebd1c5329a172c16c718623de60a3c7bf77762eb59e4e5e37f97ea84d3e9623277c83a9364d2af6bf5118b3143d3391da5fe7 SHA512 0527e11b681a053438c89d1576f3ea5967f7892fb79885d126aff1d38d4321d55c317a331cd48aee3464ce9f5a391439ff1dba8e47ac334ec2cc8645fb41b3f4
-EBUILD emacs-23.4-r21.ebuild 11065 BLAKE2B ec01f02640ccef8349bef30f81c23284652937e7635c853a34cf20116d2ebf651c629c7635a2b47072a025e645b344c0ad24f93b569341298856c42e8e096c07 SHA512 fdc01a8ca90039a86c06cac189b06d3370f218f5fe3cdc0cb614cde2fb9f4ec565264df1b96204613b7a767e5088550135899f1292737646152ab660c67d718c
-EBUILD emacs-24.5-r11.ebuild 10769 BLAKE2B a0a3d436beb7bbd90fd21fcdfe80a85aa55974d45e67f10fc542e1b794cffecba000934efc36f19c0ed520d0778c5940db4b332a455c2128e3e61a55504192e2 SHA512 74559d08251892179749c3f6a183554fd9cb9e15a6b09da95980faa8a722d352260d4b6d449b10ee04466ebc8447859720d05d9201dfdc97d72443c2dbc5aa59
-EBUILD emacs-25.3-r11.ebuild 11079 BLAKE2B 4f96040e5e3db0522b413c152b4ad8b083317e85da312afbcc348ea1082c109befdcc2f6356df4ae57d286327c65d9819f23c8795ee748175e5bdc7023a7ad7a SHA512 1b591288b60f533de6c4c2d40aac5b7eca48f1657cdc50207623ed12a88fc75d903a2fa240e6b697442b9b7f0b762097dc544f97fa15772cf06611930e4f1904
-EBUILD emacs-26.3-r6.ebuild 11825 BLAKE2B 1df12880101fce336ded064f8e91840b9f1a66b213367f46503c0ec19fcd1db45f0fedfe0db895141d44a8d2bfcc506c8683dda949429b5910b8cad360d241c7 SHA512 0608d4f489447e4545c2510a446293cd34a4164e2f6348b143a158df78dc6e362d166cda25177d86daac52fb31c7a85d1519de9b8583b1a2b4fe8782bca4c785
-EBUILD emacs-26.3-r7.ebuild 11768 BLAKE2B 72cce7a85b5da5cc375e443f3b36ddb5a7620d87e1c086c1d30990c538642ccf3c36d7a2fc62f3af33a838bba0cf965d73d8d6b12d26e36c1eee8a31a130f1cc SHA512 2fbd969d547cf7d2df6477c8f6a5732ae9a8d071df9df757de3d7b10fb39f0967662637229fdad3a427791134d99b22d0992a8ebd9a608d536ef44525771ca86
-EBUILD emacs-27.2-r5.ebuild 14454 BLAKE2B 0d90b85d520db45e5015962752a4a7c7323b562038514ce0f74845c3a5795e48fe76a70b3723c9c08fa476fe275f3ffa1cc6571ebeaa00407f93b7add3f52db2 SHA512 c1816726913c7337e8cc5977470b5bfad8d6a26661ed7b0c8f09087682c800501b47779bf8c8e7bbfedf9ea56d50d45afde2c60d2dd0d877a1fea4ecb99dfd73
-EBUILD emacs-28.1.9999.ebuild 14783 BLAKE2B b94784869076fd460e6ade14cce49d0c1af99d680a18eba6b39594ee5de0668c0fd3be9a8f589fe4a6cbcbadfe30e792d5ca129c3a183eb11988dbcee4a9547a SHA512 32c426f2df82b0b906f9445eae4d850a593c402d6e480210f1b5b7dedc7e2b092401cf76a0ebf784f20ba20f52895d62fe6a74add1477bcb0e16984d0e5d06f1
-EBUILD emacs-28.1.ebuild 14942 BLAKE2B ce48131159096bc351b0a59a5ae9f7b02c98f49e948da1463b9f6ec0d551ba6107a69a93740bc9a73de60e40f1f811be1c5c3946069177610fd5dbf3de5bc4e8 SHA512 72bc3720e0bd15e32208633d6c3adc0b5ede4fe5279f4d1301bca8ef6cade76e9f639d924112549b7a174db880b21d7d97b93b11c150dcb6636ece68a226f794
-EBUILD emacs-29.0.9999.ebuild 16265 BLAKE2B 10bb072523386a17e4c88ce713da3a72a7eec1ba36d5e5a6d99a3fd6f2fbbbc28ba7e8a89e8f026c641256138b3149ade6ff50dbed9ec5c0eeb3548265af9aee SHA512 c9a0da9f0cbcf1c23e163c7764dde0833d867e10a3ac8a460b75e6b9df04f02651df177897b6e59ec9eb2a007d53d3db727734eca5af6510d1ab6df9e04ad7a0
+EBUILD emacs-23.4-r21.ebuild 11040 BLAKE2B 5743514f4e5be8649ed1b2a8bafaa873876c71e5035632f61bc4ef808e540edf144af1277c355bbb215f922be7dd7ac843af34a42f6b6109aaecb2ef2027a6dd SHA512 049dfb3eff159a1cfe6e62e4ecbe04df614b5cbb79b9a8619bb9793e08191754270e36295124e6fa6fe79832c2d20e55138d42080d5cf7fc4dce5bbd8ad6fe54
+EBUILD emacs-24.5-r11.ebuild 10781 BLAKE2B 436f02959a1aa71165682f8e133dc0d7964cf7742b3d3a15906ac0f702e6ba42a3828d5b3beec1e84e4c5b9c74316e421bb6fe2392df9680b85efb23868b88f1 SHA512 61ef707e3d26d4d303754bc854834e915f09956ec2f9cfbf0f4916faf4a12f1922f0581c5f1baa93c5fa4ac6acbffe494f0e8d6ef8f0a904b9aa5d546a5f4d9e
+EBUILD emacs-25.3-r11.ebuild 11091 BLAKE2B 02e66e0142e1fe4a5bd262548ee01bc399328d3b3cfeaf81bf67ad76dd10405bac1013de66d648f0e3cf5aa09b46ec69989130b514ad9989c5962a06d465bc68 SHA512 1ec9fdc1c130274277da7dd689640c48b9f3e439bf948dada9d4b79d6f2dee74e22d53e2854c1a2bd223da4b81916f2217efb9dd788e344004d50a28ba9f2b7d
+EBUILD emacs-26.3-r7.ebuild 11779 BLAKE2B 69ef04e1707478913d6d574cc9569e1b7eece4152f68c70112e9caf1e192b6b2d5f74fff7e0e89f4d730429861c1b4e1d70a0c1e6b9cb42565fefe740085f8d3 SHA512 6757269a4fdd86292b107d138d8ac39f44f055858d017e988ce005dcb4985ed3b49ce58b61335aa61fb031865f8a15bd1cbb46c402ae5466529adcee6280b552
+EBUILD emacs-27.2-r5.ebuild 14466 BLAKE2B 1d561530cd52bec8ff1cb43390e0ee246a252f0776e13c726bcf3664f42f2a23cc29a2994eaa13a86bd5bd365e8457f185e5879188e36be5cddeb223548af32c SHA512 cb11f31b3e70c89147c3a0e043cdbc16808c70b505ff28eb50728d186a94db021bbf51dbb3dd7d3dd1aa2186b542db2e95b3be56325fa018b87cfddf838c2c31
+EBUILD emacs-28.1.9999.ebuild 14795 BLAKE2B 8f6313b9dc044f3a275b948b2d198b281a4422e36c6aa787b494cc13194cc1b6c26d816a275843dfdc9bd45b540b8cfc0e67f62cc0f10f4cfc1cc23e2c3dff6d SHA512 ee41220d8407d12b77ee6bfea0bad06992d8573e9b1e91a8ca8cf7e9d066b3ed07d89a84cd6d4591fec63770c79892b8b2ae069d7471b8684765c8bc1d9d2c79
+EBUILD emacs-28.1.ebuild 14954 BLAKE2B 2e41f1659fc11bf58ef1af36e707ecf7dec8214db204aae7daf7558da1c8659a3702c1505d8381a06387844345eba9c7567b82b864cd6c27f7afce1744b9dbd1 SHA512 3637eebb94593365bf811efd36f61d61266c9363b4f80569b4ab8770453240ad709aed906a9bc02e7482b83f252591cf2083b9123184219080d24d5d63fe96c8
+EBUILD emacs-29.0.9999.ebuild 16277 BLAKE2B d6d43701019061a4903c3d78187b3d25f306460a3bf9936b869843235e83dd46ad1423c74002318ddba40a7188ddc4a3460bc1d4a8f7ecaefd1f3068ff940261 SHA512 fc5098ac1e241fe6db6457a6fdf6f56d4f6e5e3608dfc81ff17abdf57ac640aa9ec15ec6066abba013ae75d56a7d9b4d53bd6cc5c9906d22a45d08d004c2a57a
 MISC metadata.xml 3130 BLAKE2B 162f49aa253a87b89e80dcbc961cacf659220c16c5b9d83e96b1eb90c40f828b87830173a80fb24cbfae50efb2ddfe51aed3e334c8c0f8e5cd30b63569e991cb SHA512 71a1b4b298ae915a33c7876a20892799c3c7b39f913b7b2606c18e6c14a4169b60f17c41742cdaab870cb60bceee14c0d10ea6f345739b1e9c3d07a14d9d60ee
diff --git a/app-editors/emacs/emacs-23.4-r21.ebuild b/app-editors/emacs/emacs-23.4-r21.ebuild
index e491036d0785..697eed5582e2 100644
--- a/app-editors/emacs/emacs-23.4-r21.ebuild
+++ b/app-editors/emacs/emacs-23.4-r21.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
@@ -32,7 +32,7 @@ RDEPEND="acct-group/mail
 		x11-misc/xbitmaps
 		gconf? ( >=gnome-base/gconf-2.26.2 )
 		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
+		jpeg? ( media-libs/libjpeg-turbo:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
 		tiff? ( media-libs/tiff:0 )
@@ -112,7 +112,6 @@ src_prepare() {
 			|| die "unable to sed configure.in"
 	fi
 
-	mv configure.in configure.ac || die
 	eautoreconf
 	touch src/stamp-h.in || die
 }
diff --git a/app-editors/emacs/emacs-24.5-r11.ebuild b/app-editors/emacs/emacs-24.5-r11.ebuild
index 2324de08efdf..1ae3f49b3d60 100644
--- a/app-editors/emacs/emacs-24.5-r11.ebuild
+++ b/app-editors/emacs/emacs-24.5-r11.ebuild
@@ -40,7 +40,7 @@ RDEPEND="acct-group/mail
 		x11-misc/xbitmaps
 		gsettings? ( >=dev-libs/glib-2.28.6 )
 		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
+		jpeg? ( media-libs/libjpeg-turbo:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
 		tiff? ( media-libs/tiff:0 )
diff --git a/app-editors/emacs/emacs-25.3-r11.ebuild b/app-editors/emacs/emacs-25.3-r11.ebuild
index 41e239215c92..8d376484b764 100644
--- a/app-editors/emacs/emacs-25.3-r11.ebuild
+++ b/app-editors/emacs/emacs-25.3-r11.ebuild
@@ -42,7 +42,7 @@ RDEPEND="acct-group/mail
 		x11-misc/xbitmaps
 		gsettings? ( >=dev-libs/glib-2.28.6 )
 		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
+		jpeg? ( media-libs/libjpeg-turbo:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
 		tiff? ( media-libs/tiff:0 )
diff --git a/app-editors/emacs/emacs-26.3-r6.ebuild b/app-editors/emacs/emacs-26.3-r6.ebuild
deleted file mode 100644
index d196a1b19509..000000000000
--- a/app-editors/emacs/emacs-26.3-r6.ebuild
+++ /dev/null
@@ -1,376 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools elisp-common flag-o-matic readme.gentoo-r1
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.xz
-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-1.tar.xz"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="26"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
-
-RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
-	sys-libs/ncurses:0=
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	games? ( acct-group/gamestat )
-	gpm? ( sys-libs/gpm )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	kerberos? ( virtual/krb5 )
-	lcms? ( media-libs/lcms:2 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	mailutils? ( net-mail/mailutils[clients] )
-	!mailutils? ( acct-group/mail net-libs/liblockfile )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( net-libs/gnutls:0= )
-	systemd? ( sys-apps/systemd )
-	zlib? ( sys-libs/zlib )
-	gui? ( !aqua? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libxcb
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			x11-libs/libXrender
-			cairo? ( >=x11-libs/cairo-1.12.18 )
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			x11-libs/gtk+:3
-			xwidgets? (
-				net-libs/webkit-gtk:4=
-				x11-libs/libXcomposite
-			)
-		)
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	) )"
-
-DEPEND="${RDEPEND}
-	gui? ( !aqua? ( x11-base/xorg-proto ) )"
-
-BDEPEND="virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-
-IDEPEND="app-eselect/eselect-emacs"
-
-RDEPEND+=" ${IDEPEND}"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-# FULL_VERSION keeps the full version number, which is needed in
-# order to determine some path information correctly for copy/move
-# operations later on
-FULL_VERSION="${PV%%_*}"
-S="${WORKDIR}/emacs-${FULL_VERSION}"
-PATCHES=("${WORKDIR}/patch")
-
-src_prepare() {
-	default
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
-
-	#AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -pie					#526948
-
-	if use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if ! use gui; then
-		einfo "Configuring to build without window system support"
-		myconf+=" --without-x --without-ns"
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with cairo)"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-cairo"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use cairo && ewarn \
-				"USE flag \"cairo\" has no effect if \"xft\" is not set."
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f line
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
-				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-		! use gtk && use xwidgets && ewarn \
-			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--without-compress-install \
-		--without-hesiod \
-		--without-pop \
-		--with-file-notification=$(usev inotify || usev gfile || echo no) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with dynamic-loading modules) \
-		$(use_with games gameuser ":gamestat") \
-		$(use_with gpm) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with lcms lcms2) \
-		$(use_with libxml2 xml2) \
-		$(use_with mailutils) \
-		$(use_with selinux) \
-		$(use_with ssl gnutls) \
-		$(use_with systemd libsystemd) \
-		$(use_with threads) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	# Disable sandbox when dumping. For the unbelievers, see bug #131505
-	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
-}
-
-src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
-	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# movemail must be setgid mail
-	if ! use mailutils; then
-		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-	fi
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
-	rm -rf "${ED}"/usr/share/{applications,icons} || die
-	rm -rf "${ED}/usr/$(get_libdir)" || die
-	rm -rf "${ED}"/var || die
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
-
-	if use systemd; then
-		insinto /usr/lib/systemd/user
-		sed -e "/^##/d" \
-			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
-			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
-			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
-		assert
-	fi
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
-	X
-	;;; ${EMACS_SUFFIX} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS CONTRIBUTE
-
-	if use gui && use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-	fi
-
-	local DOC_CONTENTS="You can set the version to be started by
-		/usr/bin/emacs through the Emacs eselect module, which also
-		redirects man and info pages. Therefore, several Emacs versions can
-		be installed at the same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from a previous major version of Emacs, then
-		it is strongly recommended that you use app-admin/emacs-updater
-		to rebuild all byte-compiled elisp files of the installed Emacs
-		packages."
-	if use gui; then
-		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-			machine would satisfy basic Emacs requirements under X11.
-			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-			for how to enable anti-aliased fonts."
-		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
-			symlink it into /Applications by yourself."
-	fi
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	if [[ -d ${ED}/usr/share/info ]]; then
-		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-26.3-r7.ebuild b/app-editors/emacs/emacs-26.3-r7.ebuild
index 131c41f26106..493f4237b43a 100644
--- a/app-editors/emacs/emacs-26.3-r7.ebuild
+++ b/app-editors/emacs/emacs-26.3-r7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="26"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
 
 RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
@@ -44,7 +44,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 		x11-misc/xbitmaps
 		gsettings? ( >=dev-libs/glib-2.28.6 )
 		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
+		jpeg? ( media-libs/libjpeg-turbo:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
 		tiff? ( media-libs/tiff:0 )
diff --git a/app-editors/emacs/emacs-27.2-r5.ebuild b/app-editors/emacs/emacs-27.2-r5.ebuild
index c5f1133679ba..50165a4c30ce 100644
--- a/app-editors/emacs/emacs-27.2-r5.ebuild
+++ b/app-editors/emacs/emacs-27.2-r5.ebuild
@@ -77,7 +77,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 		x11-misc/xbitmaps
 		gsettings? ( >=dev-libs/glib-2.28.6 )
 		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
+		jpeg? ( media-libs/libjpeg-turbo:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
 		tiff? ( media-libs/tiff:0 )
diff --git a/app-editors/emacs/emacs-28.1.9999.ebuild b/app-editors/emacs/emacs-28.1.9999.ebuild
index c4be1b55a5a9..fb9a507f39e2 100644
--- a/app-editors/emacs/emacs-28.1.9999.ebuild
+++ b/app-editors/emacs/emacs-28.1.9999.ebuild
@@ -75,7 +75,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 		x11-misc/xbitmaps
 		gsettings? ( >=dev-libs/glib-2.28.6 )
 		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
+		jpeg? ( media-libs/libjpeg-turbo:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
 		tiff? ( media-libs/tiff:0 )
diff --git a/app-editors/emacs/emacs-28.1.ebuild b/app-editors/emacs/emacs-28.1.ebuild
index 135fab7e795b..d304d33f2d1f 100644
--- a/app-editors/emacs/emacs-28.1.ebuild
+++ b/app-editors/emacs/emacs-28.1.ebuild
@@ -75,7 +75,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 		x11-misc/xbitmaps
 		gsettings? ( >=dev-libs/glib-2.28.6 )
 		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
+		jpeg? ( media-libs/libjpeg-turbo:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
 		tiff? ( media-libs/tiff:0 )
diff --git a/app-editors/emacs/emacs-29.0.9999.ebuild b/app-editors/emacs/emacs-29.0.9999.ebuild
index 077062bddd56..18990e39f457 100644
--- a/app-editors/emacs/emacs-29.0.9999.ebuild
+++ b/app-editors/emacs/emacs-29.0.9999.ebuild
@@ -116,7 +116,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 	zlib? ( sys-libs/zlib )
 	gui? (
 		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
+		jpeg? ( media-libs/libjpeg-turbo:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
 		tiff? ( media-libs/tiff:0 )
diff --git a/app-editors/fe/Manifest b/app-editors/fe/Manifest
index 9de04d08258f..1fc607891ff2 100644
--- a/app-editors/fe/Manifest
+++ b/app-editors/fe/Manifest
@@ -1,6 +1,6 @@
 AUX fe-1.8-makefile.patch 370 BLAKE2B f0bfc2c97e30ce35a904394a871b275043ee479392997117f1886cebf57fb1fe9f056fdb0bd94f4130837323fc2c20e94aeb575ad0d0f3a80af7199e2fbd3759 SHA512 09820543f98e166a9692788d0b42f29b6ee60852f0e6197af86b4b8da31c902ff9c8be59e925af21e50241d5ef6e629195190dda6a1d0317e601abb4135e1238
 AUX fe-2.0-ar.patch 502 BLAKE2B 4c3beea491ddb03a3adf5923c8fbdc0279ac9e6899216af71018af425f7caa33faa47ec6bc89b6a409d5370ffa0553fe9e7ca744a2ee238c36d2ceac378a1c3f SHA512 1c5ede0c9570f31ba3c42fd43f2c77170dce957a8376f02adaa2b82687e3daef9c8e0a941377de915be968d10e6fa34274b433eba396273cfe20ed1868dbd17b
-AUX fe-2.0-ncurses.patch 784 BLAKE2B 90af3d2e4a402314b8d18bf817e84c7ca2b8f1d0da05d36d8971e31a8e293c016f6217f89d2575c4e3ecd5bab699bc3dd1a29118f7bfc174fa1e547a38be7650 SHA512 aedf564b7083536261d9b90dc3c8b9e247b98e5845c50259f27fe665661245f2454c3a1e3294815e32bb378f4959010ac0d181c9e8d56acbbbfa657a7b58ff3a
+AUX fe-2.0-ncurses.patch 784 BLAKE2B e298339bde148b8392651f6ece4fecde819c36592da3c6dc90ddb1d9b7e11e754462a5e207b735c5cfec67f9fc0283e0115b771de460ad95b9f0170b3e02f934 SHA512 5602d10c173e1bafa8d4d7ae734f70431c1f265c8ee399302d50061bf1a6024a7a0ceb30c5d7cd516f4f5a154e9f34cbe46fd479129034c5cd515d24a2c43bb3
 DIST fe-2.0.tar.gz 237890 BLAKE2B 9fb2ad310016b52ebc807854c942c248b75a9e543aa919ccee0a1963d9a12b23ad9cbc4df884422654e2efb0b97ba2d590ac2d70be48dec3a19e7a455de5c168 SHA512 6967362b8ff9ce91e0480dfa8538e3d13b43748283423923a4ba19efc76fbe007975318d9fde758f9c9f0b8bd084ff49e45bfd5b9773a79ee85a2153646e0143
-EBUILD fe-2.0-r1.ebuild 1006 BLAKE2B 6c4b9f34dac0228a75987fca1c3eb01fa185a7166cf08c01d4a8999bb59ff1d2571e250ce9aa85917e23fd3e6d7bdc2d47a147fe0a265f8d30b59d2bf510290b SHA512 e8b77d1b60eabb7fc923a57c5918bf8cb22b3ad51d21c6882280a1a075888ecdc03193dfcea941f64f89c3c91ebd600b78421de4fdce80d8507b5d6907b909a1
+EBUILD fe-2.0-r1.ebuild 977 BLAKE2B e6dda87aba1dcbddb3ce7635eb0766532c9e5a81b84389e5b29a96f4fd67a86377e3ed49132a52224159fc9667906c5579ef716e249ed309d4697ecd1e2f869b SHA512 ece8327b5ed9dbc53090dad2a8063eb122f008e23605a9aa6f38b6d3bdbd485967bed2b78ab923a1300dc88c7b7dcb1e0be0bbd4d822738267efcf89430adde6
 MISC metadata.xml 1260 BLAKE2B 50776c6064961af6dea0d9ff8435b5a8e246ae7b1a03f1b9181bd9b6b8cc66d0fd0426df3f323672f3e2b2014a7caf08f0a55da783565a870a16e2cff220b70f SHA512 84d731be9b361299802a4924278e5d7e3288075f7cdc3b8d1f8c78fd11a8f7bf9be58c89b5e5718a11e7c52b7aba1949db6a9f6b9a4cc278428dd292734aeff7
diff --git a/app-editors/fe/fe-2.0-r1.ebuild b/app-editors/fe/fe-2.0-r1.ebuild
index 4fd949e78973..9df4b0b4567a 100644
--- a/app-editors/fe/fe-2.0-r1.ebuild
+++ b/app-editors/fe/fe-2.0-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
@@ -26,7 +26,6 @@ PATCHES=(
 )
 
 src_prepare() {
-	mv configure.{in,ac} || die
 	default
 	AT_NOEAUTOHEADER=yes eautoreconf
 }
diff --git a/app-editors/fe/files/fe-2.0-ncurses.patch b/app-editors/fe/files/fe-2.0-ncurses.patch
index 8eef06db6454..dfe720b02e6e 100644
--- a/app-editors/fe/files/fe-2.0-ncurses.patch
+++ b/app-editors/fe/files/fe-2.0-ncurses.patch
@@ -1,7 +1,7 @@
 https://bugs.gentoo.org/818415
 
---- fe-2.0/configure.ac
-+++ fe-2.0/configure.ac
+--- fe-2.0/configure.in
++++ fe-2.0/configure.in
 @@ -55,19 +55,6 @@
  AC_CHECK_FUNCS(strdup)
  AC_CHECK_FUNCS(strndup)
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index c5d6102f2ccc..0f89a686c462 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/ecb/Manifest b/app-emacs/ecb/Manifest
index b7be406bd2c1..71dae3833e6b 100644
--- a/app-emacs/ecb/Manifest
+++ b/app-emacs/ecb/Manifest
@@ -1,5 +1,5 @@
 AUX 70ecb-gentoo.el 63 BLAKE2B aafdd070c44a1f7f4aad23ee1d0ff39f1816bb46fa1e667ef12eb276d1877ca18a81c43ae66c285574b85a089255e6613c92dbe751d382280b42613976829cae SHA512 984cfbfa398bd60008dee83721a55f5c6cad0a71caf0d7cc194a84f0d7c061a9a99398e40e90f0a9cf79d2ff689e374c860612bea16e9fa0049d7a82edc56283
 AUX ecb-2.32-gentoo.patch 3430 BLAKE2B 8d373b5ebc1064d5b2fb713f6d3bc31ec34eddfeb9b9519e655bdaab0ced4e4c4aaca03b3013d0daeceaca20f9210625b84d76264be24d9ea99a5745336c0f06 SHA512 1902cec83e62c9b65a62a1fd4a7c8e2ae309b3bd2217b6f821a5a047cf3bdda24b9b5c68e672c1555196a7d28ce06c22398ef15c3c0e6b87bcce1e15d3c333fb
 DIST ecb-2.50_pre20170728.tar.xz 562144 BLAKE2B 922a1f101d01717c5d078fbb055903c43e91360061b792e96e9aa9421d19df2cd47f7e69aae6dba4f188e26682d2a758ff8aa57ff500e5b6fdeaea6920b21a25 SHA512 074738cc323b595caf3d34d6eaa08d6a1a8d3a53762c9bf48b751ab25a16a26a8c71984996b7e7616f4999a0876c6d03751e1e45b68aad712020778da387a59d
-EBUILD ecb-2.50_pre20170728.ebuild 1188 BLAKE2B a95389be81a77807f50441abd494082d9c0deec50e8e26b10f1e800466e93de3a4312f109e25fa1ccbaec3c29aea17d903a97bc7509950dc65b86b7ef777482e SHA512 8ebf9de92d861d87d4534b8398803bdfad30ac81b00aba09710dfd2d715b94b85551bfa6f93618ee1a7e9a859b6656f3af98681467ea1db7e9ba4c88e09b3aae
+EBUILD ecb-2.50_pre20170728.ebuild 1018 BLAKE2B 11d8181466bcd0935e3fee53c7741e1044f47a85a97e7be5d0813ed85cdc4f090e671f14024e86619b3bff205605b837bd56a6afe5efdbbbc1201b2af00c0081 SHA512 202c0ccf5e7617088d63508a7602daf8c53014a13f6e19bcf5a77df8affd118c9d46fc88ff5d2dba34130980b8511ef1df778b4bd1d7d028f6472383af1b4030
 MISC metadata.xml 1594 BLAKE2B 66e334a19d34ede131561a899b211c6daa38a3c48bd876c111b3f3fdeddf8574b82e6869e4aa3addc7457c2f4f05399efbcdae76d6e4d527e24d0860281e000e SHA512 05474e40ff5bcef5d0822379088796987f4814961c967bdf6389f0c31ae13b1f17d29b9e308eec9e7952b2e2fddfc9af9bd4b6da5e8d2823a85589cf9911a563
diff --git a/app-emacs/ecb/ecb-2.50_pre20170728.ebuild b/app-emacs/ecb/ecb-2.50_pre20170728.ebuild
index 204485437855..9c0199f9da19 100644
--- a/app-emacs/ecb/ecb-2.50_pre20170728.ebuild
+++ b/app-emacs/ecb/ecb-2.50_pre20170728.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,10 +13,6 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="java"
-
-RDEPEND="java? ( app-emacs/jde )"
-DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${PN}-${PV%_*}"
 SITEFILE="70${PN}-gentoo.el"
@@ -31,9 +27,7 @@ src_prepare() {
 }
 
 src_compile() {
-	local loadpath
-	use java && loadpath="${EPREFIX}${SITELISP}"/{elib,jde,jde/lisp}
-	emake LOADPATH="${loadpath}"
+	default
 }
 
 src_install() {
diff --git a/app-emacs/rainbow-mode/Manifest b/app-emacs/rainbow-mode/Manifest
new file mode 100644
index 000000000000..f2fd2646d780
--- /dev/null
+++ b/app-emacs/rainbow-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50rainbow-mode-gentoo.el 124 BLAKE2B c05030d9797d02cd6f6052ba63650be266072caa75cbfa76fd6d6fb4dc5bd3e33d51dced59caa73bf0772eab48e27ec0d98b8f2a1a147ac854886c23300ed24b SHA512 3783538fa462187e466241d6c2f511db3a0a2be1f3025d73bd0f58055642f9662d37836e36bcb804d2225fa08e6eaae54fc86a92847a23110aea09bc6ef9908f
+DIST rainbow-mode-1.0.6.tar 51200 BLAKE2B 950da4039eb392d42281d301de05cb669255b95a4382e582258676082516208980540eeb8b69293e2cd73fda3b0438256def408a2804a58bdb745cd72eeef604 SHA512 a7a3f18239dac7e63d022f513e028718552efc13da9589901a0e64377a00d9f3f56a0b708c55eacaf7b438fd29f7bbdb69fafcc4ba65dd6f9e72a82e3ce7efa7
+EBUILD rainbow-mode-1.0.6.ebuild 418 BLAKE2B f14ca87ca689581d47460317b2dedf024c1507a5e91936a3a28d47ea4d5bc8dfaed54d6c30c57aca09428217dab141493f14e0c5435fc588385ba0037bcf9493 SHA512 b144b7ffbea370349efff25c974bde0fb09251c47528256d8a8f4c8af8533368f2632b9b9edfe89676635ff0eb345f4dc22c663d4561b0064fee206a84a90a83
+MISC metadata.xml 362 BLAKE2B 57466b79c1fa4fb860136339636cebce7577af31f69af1e7ef17674cc415e23d889844f5a86cd93fb597f1818f6125389bc5c4c12c0b02de55df13837a7c6471 SHA512 74964f88096fa77a816348c803eb22207cd4b204e10e9ba2cb309c86b12d2ebb2b85df33702943fe7c257d5fbf90364b947292523f9d914d1667237e874ebe57
diff --git a/app-emacs/rainbow-mode/files/50rainbow-mode-gentoo.el b/app-emacs/rainbow-mode/files/50rainbow-mode-gentoo.el
new file mode 100644
index 000000000000..624fcb4663ea
--- /dev/null
+++ b/app-emacs/rainbow-mode/files/50rainbow-mode-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'rainbow-mode "rainbow-mode"
+  "Colorize strings that represent colors." t)
diff --git a/app-emacs/rainbow-mode/metadata.xml b/app-emacs/rainbow-mode/metadata.xml
new file mode 100644
index 000000000000..76127bfcf698
--- /dev/null
+++ b/app-emacs/rainbow-mode/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="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">emacsmirror/rainbow-mode</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/rainbow-mode/rainbow-mode-1.0.6.ebuild b/app-emacs/rainbow-mode/rainbow-mode-1.0.6.ebuild
new file mode 100644
index 000000000000..bd405af3dce1
--- /dev/null
+++ b/app-emacs/rainbow-mode/rainbow-mode-1.0.6.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Colorize strings that represent colors inside Emacs buffers"
+HOMEPAGE="https://elpa.gnu.org/packages/rainbow-mode.html"
+SRC_URI="https://elpa.gnu.org/packages/${P}.tar"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+ELISP_REMOVE="${PN}-pkg.el"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 98140a7a0870..fdc781ea964a 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-fontconfig/Manifest b/app-eselect/eselect-fontconfig/Manifest
index 61bc760b0b79..d6261c15709c 100644
--- a/app-eselect/eselect-fontconfig/Manifest
+++ b/app-eselect/eselect-fontconfig/Manifest
@@ -2,5 +2,5 @@ DIST fontconfig.eselect-1.1.bz2 1713 BLAKE2B 30af0471a52d7e2785e6e0e5847f51f3a11
 DIST fontconfig.eselect-20220403.xz 1396 BLAKE2B ff29f82f1d8ec945fbb555a7bbbf6c672e281c0c2b9352b22feafd298805ce1f039b43868da20c6fdc540c63117aa0ca2c181440d44394180f5fb4bfbd3e8278 SHA512 aa18510362e0577d4d0959000710b2e35e9870167d18b10e086ff19ed25e8956c5d1f71a1cfbdc7496d417822baf6ebdd9e0044ce9cc220c0aaa4b8ba5694d34
 EBUILD eselect-fontconfig-1.1-r1.ebuild 778 BLAKE2B f8a1330410fd05e312869c5163c214f0560a2820367521d59c4a0eabdac6dcba12a23d862b4748ca4fc14d731810528ccdbb20a4bd7931343727265f738861ab SHA512 83447ac9ce53194ab50a29c516cf1a5f68b6704d4104d0f71c5d278e0526e4d66f02b9e604c444ed53e668b397abec1b739d7cafdf3e9a1822b7a1ae32f09b8c
 EBUILD eselect-fontconfig-1.1-r2.ebuild 740 BLAKE2B 42aab935c4e38565e78074dfcc980fee0a5b9b704d926371e34178ee6b06219cde3e5bec6b39c34def93894385af0acede296d2373bed31606b4c6f6f3a3a438 SHA512 b65047ef6192024d69592865ab1769b879dd42ff285cd0ed250df9400a5ca412a81d8daf521e77fb4c9e224b0b3b5469ebbfe3cd813447b79ad97d12ff4b16af
-EBUILD eselect-fontconfig-20220403.ebuild 739 BLAKE2B 23c5ea4d710d541c36f0d9e8f1c8acb759101e12bf066795cdd0ccad214407784277154177ddb8df73b246ce8f188b6dcf0dfdae730f91150ca52ded482117da SHA512 e1d93c9aa2f29664b3b303a33a7ba3bddc1764e65a70015086ed5a70ed720974d41779073c3f2163f223f7ba2f8a252045840f58e84ca6f38581a23c54cb1657
+EBUILD eselect-fontconfig-20220403.ebuild 746 BLAKE2B bdd75341a228cbe2344a6b7253f986be937fcd0340592ffb1535a09bcd1046d87b87ffb1c91f0275ed3446a89ce5b9c7409682fdce0065e2e9f9764cc1c69d09 SHA512 ad43ac3403d796f1cfaf1dbb63d39405eca0d8be0838446d0a221728d967b38cf5cf3c2595b020f3de450abbafaa02c89ac2292fde1cdf901a6adb64d3e91709
 MISC metadata.xml 263 BLAKE2B 0b50fbf82dc925c031f1c1fe78929960b5aa70f4ec80bdd34cec9017ac9f07f9a3960421fe5a6a7f9b728c89570aed37fc1460c3f300da751794f1e527079db3 SHA512 a1d548b6228cd790b0b5147752c5495017391cfec3065bd6ea8ee5f8e1f86905220f6b764e71531627323a29d1218b60d36b6b23e9ca585775df12c260a6b311
diff --git a/app-eselect/eselect-fontconfig/eselect-fontconfig-20220403.ebuild b/app-eselect/eselect-fontconfig/eselect-fontconfig-20220403.ebuild
index 5a1770dba5ee..630592e8f2cd 100644
--- a/app-eselect/eselect-fontconfig/eselect-fontconfig-20220403.ebuild
+++ b/app-eselect/eselect-fontconfig/eselect-fontconfig-20220403.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/fontconfig.esel
 
 LICENSE="GPL-2"
 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"
+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=">=app-admin/eselect-1.2.3"
 
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 126a4e0ded29..97779af1f265 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/ibus-table-others/Manifest b/app-i18n/ibus-table-others/Manifest
index 12cd3e9bca34..ea2b8db79f0b 100644
--- a/app-i18n/ibus-table-others/Manifest
+++ b/app-i18n/ibus-table-others/Manifest
@@ -1,5 +1,5 @@
-DIST ibus-table-others-1.3.11.tar.gz 662398 BLAKE2B a600535b51b731c482eeecb78b8bff6ca14795e411348ed0e2cd4207ad1a89aed7d338c6b706695dd734f405ee5203e23dfffa370cae12ad763eabf6bbdfe848 SHA512 bfa17338e3a6a3e392bb3e5e5736af9bfa5584a897aea4ca72aec0df2c84dc94a0737f8fb87ced382e6acac3f8169ed2aef93a2f94330a4829048d009cb96ee0
 DIST ibus-table-others-1.3.12.tar.gz 673850 BLAKE2B a0633ecca428c1d2723ba0e5f87a9fabc74d3c9f69995c63a22c1163c1d00880103ad764d820b3a13e10825d4067e3192e61ecb61f312b3a891668fa8348e447 SHA512 526b3664ec0d7dc89f5456a5da82c5e42e267654fba88f6b3134ab35f3b196d6fd3f1f8815be0e36c817b28550681005caeefa04f7c7c2c8560965dfceaa4d87
-EBUILD ibus-table-others-1.3.11.ebuild 550 BLAKE2B 17ad3e0df0cbb970720096eab210c6a594fa8246a13848a571f49b404639e08e1ed3497291e87ce43900e304da17c66961dab70c6874f2daedf0ce2ec74b61fe SHA512 a70c392425112b866ce7f3e7dc77959fe72834ef53c73bd3321d7369136f6dffe85c2ea4fa87c2d692b4c93c672a06ecfd51a9ed9ebad6c21be1113910e072ac
-EBUILD ibus-table-others-1.3.12.ebuild 552 BLAKE2B 04f207a7fdfea1d1cd9f5871a609785c94722ece0c466c9e9137c5aa2c3bd2d9bd9d7c6de3e3403bbbb5efacd1136969da21a94c3cc0f17daddf4e4ae9a16aec SHA512 5c4b277df0c2e9e8a9604930b197bd23a7971f0adcd6ad8833a0618e37e89b8d95b203925f224b16d8de573f96eedf32286a3700ecd73834abf814c4b584fb75
+DIST ibus-table-others-1.3.13.tar.gz 676883 BLAKE2B 2486565f51781fc4d0a270f84c97d2525478392f165e4ebeda8c4b0d64405aa91e4568ebea1ec946fe57bcd9e1ddf08178ce1d46c3bf20571c71f94035df2f9c SHA512 1276139f3ce9e1d7a8e117be804e5ff0f4fba3f1d80600a10fb0fa25327a5c368e315bc87b68219091cdaa5927e536306111df0a4819503b2ec7002374cb2534
+EBUILD ibus-table-others-1.3.12.ebuild 550 BLAKE2B a2e386bda068b778303204ed457742a6dbf2c9f417beb8f01cb555cd55019531238e9247bd36c9780aeb4614f6be5f1d22642d433536e1a108b19d4f32e0c9f3 SHA512 6599df7595922176fe330634e8f77088f45b59b8600690bb50e06c3fd89c1b73260420ce4e9b9dd5a3bca3d1e5825c2a600dc47dfccca07788f892aa10d9901c
+EBUILD ibus-table-others-1.3.13.ebuild 552 BLAKE2B 3f5230d2bd157114f40ae8152868eb8d3c6d341a3effd76903cf81bb019237807d54a3e85e859eeb5e36bb8cee16b5ced67107a52f8470642309bab234009348 SHA512 ef449363f6731ea50736115d999cf3ef6f3450e7e51669443c3312c6a2238f80ace2536eaf5f740a7fe1dff015d6461ccc327e782406754cb4ccb6f60104f059
 MISC metadata.xml 642 BLAKE2B 0eb23a3102a282b9ff6e77a623f119ed41d1aff2afada1a32e4124de6b97ad4239bcba7738b9f3663f1277e70972314047a25c6da3a61d04ff7b0f6aa6caa896 SHA512 51b6e52fa107591db67c5ddddee30653475882125228c04ad37729eb7cf09fe9a39e016816177a2793a3bbb51a3001422b3f958c95832055867bfd98ea0367ba
diff --git a/app-i18n/ibus-table-others/ibus-table-others-1.3.12.ebuild b/app-i18n/ibus-table-others/ibus-table-others-1.3.12.ebuild
index 65f07652f849..46545300051f 100644
--- a/app-i18n/ibus-table-others/ibus-table-others-1.3.12.ebuild
+++ b/app-i18n/ibus-table-others/ibus-table-others-1.3.12.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"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/moebiuscurve/${PN}/releases/download/${PV}/${P}.tar.
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="app-i18n/ibus-table
diff --git a/app-i18n/ibus-table-others/ibus-table-others-1.3.11.ebuild b/app-i18n/ibus-table-others/ibus-table-others-1.3.13.ebuild
similarity index 87%
rename from app-i18n/ibus-table-others/ibus-table-others-1.3.11.ebuild
rename to app-i18n/ibus-table-others/ibus-table-others-1.3.13.ebuild
index 604b323c7394..bd2efd099ce5 100644
--- a/app-i18n/ibus-table-others/ibus-table-others-1.3.11.ebuild
+++ b/app-i18n/ibus-table-others/ibus-table-others-1.3.13.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="7"
+EAPI="8"
 
 DESCRIPTION="Various tables for IBus-Table"
 HOMEPAGE="https://github.com/moebiuscurve/ibus-table-others"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/moebiuscurve/${PN}/releases/download/${PV}/${P}.tar.
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="app-i18n/ibus-table
diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index de774624d6d1..a6ae2f3c4b7d 100644
Binary files a/app-laptop/Manifest.gz and b/app-laptop/Manifest.gz differ
diff --git a/app-laptop/thinkfan/Manifest b/app-laptop/thinkfan/Manifest
index 9a03e3e2ae13..3ac97f7cc347 100644
--- a/app-laptop/thinkfan/Manifest
+++ b/app-laptop/thinkfan/Manifest
@@ -1,7 +1,9 @@
 DIST thinkfan-1.0.2.tar.gz 77653 BLAKE2B 1b40553380f9b873883f0dc587665f24cd2e07de7a7e743cb9f99a3282f380da2258265a612b1c97d2945fed31aee0d6cbc30ea2a18c0b212e877e7635eda336 SHA512 d9133538096a7c5757f599adfebc8217aa7334a102573d6757f03b5c012a09d600be923930fd9d62f4afa591f5eb7a70a1c328004bddef85494d1a7ce56b648f
 DIST thinkfan-1.2.1.tar.gz 84253 BLAKE2B 5a816b8cadbc72424384966b0bc6bcf17070eec703584c348bc28cf8ee59e4d67a56d351f0c1d9d55328326b21134f0158bf976f86336bb5d59b81c137b96c83 SHA512 27db9f54c26a85093ff7b9f8a0e26f679e413489f608b561b819a702fd077a33e62197e41a1f1f4495c66daa1ac70603c063e6ac4cdd09d13f4005f73685152d
 DIST thinkfan-1.2.2.tar.gz 85779 BLAKE2B 55d3806756aa638d8a97b74a8b6142f58e4b805c319cea2be0c4022fba7b9c2eb286956752788197aa50ee2a07f1fe826657ba0b95a47832a9f4e0f5070f3f82 SHA512 7991ef9e1891e9f4d843a0421404d8ccdedf398777f44ed0c6c58070849a6eae70044a72bad4ad9595e9528551212db228bf868371fb9a642918a69d2b4e917c
+DIST thinkfan-1.3.1.tar.gz 87239 BLAKE2B 219c72ada289a7168ee41872080ff15329c80f2a75326d15b726606e95ed39279afb85f0d9b4d4efc6dc2d4ce81d34bfc31bd7f565a86b717830ddeb579a0618 SHA512 dbb92ab1a7f008ecb5c125b105191b9021cccf3b59f6dbd0fbdea03dd730b573214d8a44b219c4efd458a6cab94deae3bcbdca030db72e79ca221ba91f0c2c6c
 EBUILD thinkfan-1.0.2.ebuild 909 BLAKE2B 7f8eba1b6807270d6d9fd71c68163f8c4837053f23aa76b68b4d45adfe803988f6607bc556cfc10c4d6e6afadbd8a8e08af4c057bf2e88e8bd3dc56a2db7391c SHA512 0c452ffb9c5bb01ebd956a91f422073a1bc65f247590bab15c666a45d921da6138041ebdf5064cec2038cded4860c522760298802b33beea3f6470c0f5901d1b
 EBUILD thinkfan-1.2.1.ebuild 911 BLAKE2B 180fa96487602980c8fd6af469ca54bb30826907aa23660fa1eff483ef79441e4313fd60302319853158cdf4d72d331dfee08d9fe7ef81e8a32483bf9395101c SHA512 33c42c44ea7251eab3b8164a0e397f6de51729730f5b4f754fb0420e20686afe0b79367323f73248569410060387e09cedeb0b6aa5826f6a81a43d84a20c1abf
 EBUILD thinkfan-1.2.2.ebuild 909 BLAKE2B fc652c16894485bd2c00054872735f0c40bbdc0435127a06d39056f9fa838af7f6b3a51eabfbd31a5ef40c2e537c41ba9afd2b102ec4d7ebee53f1313f65f26d SHA512 75d7ea0e1d9c865f4ea4a1b0bbe3aba586fb0f38a1035d46c671d28dfebd4142a95dd58684bc4a2d87552fe4ed7a75189fabea80adb8675e8eee2270fec6cf8b
+EBUILD thinkfan-1.3.1.ebuild 910 BLAKE2B c93bc6bf58302368c3cf5d90cea08a7f57647279a946eea6212388c6a7729ed8055606be6218783a5aeb98bbc3813fc1a0218c0741aea68847684a207d694681 SHA512 e443c4c61f1b3b5d931bd71e2561cb42a402d9297f5ee4e1da0943b123436ad64d16abdd780d0f37e98a91b1281b577b49d58c6a2a491b286ac1dca869909767
 MISC metadata.xml 745 BLAKE2B 5617fc4c66216efb92c383386785aba8687ebbeb01f670d058cad1e6a67cede6276cc72819273f7a0da0eb9bebde0fdaac91aaa9df31c766a0fa2560c6ee4718 SHA512 c92fe6754caa6dd05328ace27e4a371649514568e7295e238b1e073ae00211e887c353565ce70f3d99b87343ff1be5fc21b1c01e96b43e8491f358bbeeb7b619
diff --git a/app-laptop/thinkfan/thinkfan-1.3.1.ebuild b/app-laptop/thinkfan/thinkfan-1.3.1.ebuild
new file mode 100644
index 000000000000..316faa87672d
--- /dev/null
+++ b/app-laptop/thinkfan/thinkfan-1.3.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake readme.gentoo-r1
+
+DESCRIPTION="Simple fan control program for thinkpads"
+HOMEPAGE="https://github.com/vmatare/thinkfan"
+SRC_URI="https://github.com/vmatare/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="atasmart nvidia +yaml"
+
+DEPEND="atasmart? ( dev-libs/libatasmart )
+	yaml? ( dev-cpp/yaml-cpp )"
+RDEPEND="${DEPEND}
+	nvidia? ( x11-drivers/nvidia-drivers )"
+
+DOC_CONTENTS="
+	Please read the documentation and copy an appropriate
+	file to /etc/thinkfan.conf.
+"
+
+src_configure() {
+	local mycmakeargs+=(
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DUSE_NVML="$(usex nvidia)"
+		-DUSE_ATASMART="$(usex atasmart)"
+		-DUSE_YAML="$(usex yaml)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	readme.gentoo_create_doc
+}
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 4fcf54851615..2b08a6184480 100644
Binary files a/app-metrics/Manifest.gz and b/app-metrics/Manifest.gz differ
diff --git a/app-metrics/ceph_exporter/Manifest b/app-metrics/ceph_exporter/Manifest
index 7ff2d73559ae..b067132ba5cb 100644
--- a/app-metrics/ceph_exporter/Manifest
+++ b/app-metrics/ceph_exporter/Manifest
@@ -1,6 +1,10 @@
 AUX ceph_exporter.confd 48 BLAKE2B 617ddc4f13ee9307f331d0c8de9b9e329786fccc0bbf68211863b61f5a32351a2936972278ef8fe283e0a2cc9ea2ce55d14412cb9777bf88aa9c3a49b3eddfe4 SHA512 bc5be0687671d08d28288d652eae7f699cb406989efa49ccfa38bcf4e8f6ceaf2ca5e2d2a81e5224cfcab7b712b52cca37d5cd0ea2e2b7f49abf8720e217fe00
 AUX ceph_exporter.initd 670 BLAKE2B 57b1ee2932309892f534f363643a93f1e92acf6dc53108d54c9d571574a137e3200440b9b6fce8460ec2c6f7a3b1b4b830be5425b7a76765b1532aa9f8ddf249 SHA512 5014b09cd1cf1ad1e8fa43de16a886b53af43ac011bd94bf517277eb58c4a6739066f5bd7303fd0d9f7fe5b713b5d4305db1dc45916f0677f9f71c0de355b3f7
+DIST ceph_exporter-2.0.7.tar.gz 337138 BLAKE2B c5334ed7650b273d572c8e7b6a7138dc18c086fb4e198e8b3c5c820c95a20e2b9e7d91cbfe2224ba3de9ee03761a59cd929165e638556ce7c57e9a490906f61a SHA512 db3662811c513e732aaecbaaedcb787333886a059304a651e836c4b80661a0593b667608a9298e24561ad2db085f3adacc73ee1777b496ed0ce9760534113457
+DIST ceph_exporter-3.0.0.tar.gz 336128 BLAKE2B 32f25ea46a147be20bb4f095ab01e9f97bc17ad6b852140c9254cfb6099531c51b0867c50abccd04dd396a758e2179ebf20a6cb315fd8c474e320c303c9f1644 SHA512 815cb676d4dcf49a665ec024e82d4047c94b9fbf9c7e0d2998028da6fa074313f0bb10f3831a16d05abd28c2954605f628977f728ac37f1a69fbc9d734304747
 DIST ceph_exporter-4.0.1-deps.tar.xz 7402752 BLAKE2B 4619eba4c1630cd683193fec8f449698587dc8d17c26992e033fa7495934de26bcca84fac4ac174e25e7f405c27033fc324703748cac59f90b6e58c2548f8cd2 SHA512 893a6d246c640647ac55f5f32d657cbd80bec3c9404e1484e6188e4e045a20d01d50559723105f179d438019f66d904938a24ce164f85a41631930067d92f7ba
 DIST ceph_exporter-4.0.1.tar.gz 143653 BLAKE2B 2a8c907fb5ff06bc629644aab94b450646f6b25ff057d2b01485f0131cef3e64e3b159f029f29cf78c8d6b450ff9b750858799fe079256509e31e5b8bcf3e012 SHA512 154e75cc397635450d2b99e5e56c829fd5816e9aad95707eff42500ce21fd92a6d12772a58530b580b8e14e5db7c32d2d24f395175f414df9d89fbcbb8239ece
+EBUILD ceph_exporter-2.0.7.ebuild 1129 BLAKE2B ad8a976633fdec71a7b12e97d1e85ca4892d88c64e2d357080ff45a1168602dcf0c045c4189438bd1fc81f155112b6b3ac8b4512079d580cf53495f9f5752a56 SHA512 56a6eca109e43027f97ced4f4f6a6fec76817bbaa2ecf7c9ce9c4929a088d053310fd05d46ccebbf77a9456841b15a9ec57a54165eba66e119032b3dadf680d7
+EBUILD ceph_exporter-3.0.0.ebuild 1129 BLAKE2B d192cb8d6675e3df665d005de051a4765563cfccaf6ea1a499ec15856fe506dbecede311dd5f53e137446c472f503240f77f778cbf767fc9e30d6cbba0e6383f SHA512 b73edcea6af2832def4781754b49a69f4fd958c5f14aaf463279c6d76f4d954a450ff32ee2d43ffcee8824009f840252017fe2f4d834cf35324eae5ac971062d
 EBUILD ceph_exporter-4.0.1.ebuild 939 BLAKE2B 575f51efcfa7aa42de719f2ac2c8a1760afc5a2fd13f8cbc79ae2401dcaa78b72887938076b6fa6c8769dd4903d05b81f41585d77be872a3677c512ddc9747d5 SHA512 6797ad6fedb132e3caaf465f47a18411791a8f0c9d40a02cd3860c177a381d543775ac47af01a100052de47ea19aae6f4eee0bf90e3db60993f45f970010cbdd
 MISC metadata.xml 243 BLAKE2B 63665ae2020bc799fa6ebd6e1fca6755be6498803fdbc17cc630f9f4ffa03fbd46a9ad396e70adc3bc1c32b0a746fe4bab1c6291f32e68e636251207bca9e95c SHA512 78eab20831018fcf4957171a83aaaca9ced53380e01f083c07450c30fa1adfc02dd50ff2fa9f491dd62802f6e779264add1c47a09ade0a35cda558c1d5529ad0
diff --git a/app-metrics/ceph_exporter/ceph_exporter-2.0.7.ebuild b/app-metrics/ceph_exporter/ceph_exporter-2.0.7.ebuild
new file mode 100644
index 000000000000..c46790608ec0
--- /dev/null
+++ b/app-metrics/ceph_exporter/ceph_exporter-2.0.7.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN=github.com/digitalocean/ceph_exporter
+MY_PV="${PV}-luminous"
+# This inherit is deliberate since this version of ceph_exporter isn't a
+# module.
+inherit golang-vcs-snapshot
+
+DESCRIPTION="Prometheus exporter that scrapes metrics from a ceph cluster"
+HOMEPAGE="https://github.com/digitalocean/ceph_exporter"
+SRC_URI="https://github.com/digitalocean/ceph_exporter/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	acct-group/ceph
+	acct-user/ceph
+	=sys-cluster/ceph-14*
+"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	pushd src/${EGO_PN} > /dev/null || die
+	GOPATH="${WORKDIR}/${P}" GO111MODULE=auto go build -o bin/ceph_exporter || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} > /dev/null || die
+	dobin bin/ceph_exporter
+	dodoc {README,CONTRIBUTING}.md exporter.yml
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	keepdir /var/lib/ceph_exporter /var/log/ceph_exporter
+	fowners ceph:ceph /var/lib/ceph_exporter /var/log/ceph_exporter
+}
diff --git a/app-metrics/ceph_exporter/ceph_exporter-3.0.0.ebuild b/app-metrics/ceph_exporter/ceph_exporter-3.0.0.ebuild
new file mode 100644
index 000000000000..ca3148b06ba0
--- /dev/null
+++ b/app-metrics/ceph_exporter/ceph_exporter-3.0.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN=github.com/digitalocean/ceph_exporter
+MY_PV="${PV}-nautilus"
+# This inherit is deliberate since this version of ceph_exporter isn't a
+# module.
+inherit golang-vcs-snapshot
+
+DESCRIPTION="Prometheus exporter that scrapes metrics from a ceph cluster"
+HOMEPAGE="https://github.com/digitalocean/ceph_exporter"
+SRC_URI="https://github.com/digitalocean/ceph_exporter/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	acct-group/ceph
+	acct-user/ceph
+	=sys-cluster/ceph-15*
+"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	pushd src/${EGO_PN} > /dev/null || die
+	GOPATH="${WORKDIR}/${P}" GO111MODULE=auto go build -o bin/ceph_exporter || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} > /dev/null || die
+	dobin bin/ceph_exporter
+	dodoc {README,CONTRIBUTING}.md exporter.yml
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	keepdir /var/lib/ceph_exporter /var/log/ceph_exporter
+	fowners ceph:ceph /var/lib/ceph_exporter /var/log/ceph_exporter
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 2c8ba1fb75ad..521ff7f6aaed 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/nnn/Manifest b/app-misc/nnn/Manifest
index 24579b083442..fa15b7b2ddff 100644
--- a/app-misc/nnn/Manifest
+++ b/app-misc/nnn/Manifest
@@ -18,6 +18,7 @@ DIST nnn-3.5.tar.gz 205980 BLAKE2B 4c49fb0feb4f04075fd64d0b42643256cceec84185df2
 DIST nnn-3.6.tar.gz 204688 BLAKE2B 475bd783333bbb55f0c64a3028712792f9376f6a604ba18a7aef3735f1afc5aa91f419f3f41b2c14d525d02fb30db6ca7078fe56f4c7cce2f97c32079be129ea SHA512 e997e2279c495c7235fdfd51ffcc36949686889424686f050329c7f127c62f3ddc807a758ee1b18b00a1884eeaf9f94195d02b2d0e2d76ae1523b8bf2cef1232
 DIST nnn-4.0.tar.gz 214555 BLAKE2B b0490662bad07213ff79b8865b8d9672d1ff98d93e3705e0aa45d103c151274934dc0cff66731f7b157007a81b9dbb5d9f3edb6a17daddcfb265f73b6faa400e SHA512 fde552a31674c9bf50a2e98de4456621bdc97aee36cd5efd7ad0cc33959965d01469fb20b12868ebffd4c8da79990b502e26895cb5b047ac8821e2ca09b0a234
 DIST nnn-4.3.tar.gz 236606 BLAKE2B cec0a73a40fae76e478c3299e2ae8a613c2e1b16e009d4f69cc3c9c9f6ea5df4048fc7f941ae6369293cf56df9b91a496531f4b34bf05f1dbbf8fab9120ffe78 SHA512 588af174d86db14acf5d1e2ac42f88ca5c6f0e105996a58771e7e0f989f224616e7a12d74fecc96540a9782db0cf8857c21bf0f50df4ee3b4b5c641291c64575
+DIST nnn-4.5.tar.gz 242191 BLAKE2B 2a1564520222bc51df64c495ffa7a22fc3200f4572281e4b4e998e999b41c171f4b832502a054741040fa9d87d0da0d0d23949c0d867fc4c2830722045654c3d SHA512 ab64f0e6211b14e90a4632bb0da9a1214635c9a06718c7c434d344d69d1087b4d5d978d44f38c1b03bb555e3055ca5033bcbca40927135757a468e6f1b99046e
 EBUILD nnn-1.9.ebuild 862 BLAKE2B c46fdf2d4a9fb6a4be07b557f44ec28764c4d24f30299941a31f45700f4ab4c1a1ac726146415522b2987128d9bb05d5d8c3fb2c7ed2920ff434004dac3f6626 SHA512 127bec82201acccd3764898f10636c75eb9af9562dec651fed4fd1a0fa1d6b6ed385fee20fc09bad8b8947c775011c6e1021edfcdbcddcd2c7fb8fdeeb5fb0bc
 EBUILD nnn-2.0.ebuild 859 BLAKE2B 9be51882e9a909742c338fe184f16834fda7168937367c6a315ea1691149066842a2a842ebe15eb9b3c01a0796604ca35ca6f92148f35c752465fbfbbbecc003 SHA512 1cb7118bb1e70455f15c0afd549a0000fa3de460c21bb08bba3e904d64230a5ced8c579a1c837e5c7dc38a5adc916e8e0f9efbe6bce0d30a44226a1fd753c555
 EBUILD nnn-2.1.ebuild 859 BLAKE2B 9be51882e9a909742c338fe184f16834fda7168937367c6a315ea1691149066842a2a842ebe15eb9b3c01a0796604ca35ca6f92148f35c752465fbfbbbecc003 SHA512 1cb7118bb1e70455f15c0afd549a0000fa3de460c21bb08bba3e904d64230a5ced8c579a1c837e5c7dc38a5adc916e8e0f9efbe6bce0d30a44226a1fd753c555
@@ -38,4 +39,5 @@ EBUILD nnn-3.5.ebuild 857 BLAKE2B 5d83ed554d1f63667bca5f3bb3d39b06594693bb3a2a59
 EBUILD nnn-3.6.ebuild 1050 BLAKE2B ab4ac86b9c72e0bbb44b3e08ad26b6953bdef7272387cd58019806c4e722a210c19c8afa504b7753fa4905dba70b4bdcf59bb92746a73d515e63de1f76d8c5ba SHA512 8200e20e253a0970859fa53451f7e811fe7dbe8e7d2bf2631e81e58aff97271c325ce36bf1acc62542d96e2baf3fe26a628702516140dce94935e7303ff9e4c6
 EBUILD nnn-4.0.ebuild 1050 BLAKE2B ab4ac86b9c72e0bbb44b3e08ad26b6953bdef7272387cd58019806c4e722a210c19c8afa504b7753fa4905dba70b4bdcf59bb92746a73d515e63de1f76d8c5ba SHA512 8200e20e253a0970859fa53451f7e811fe7dbe8e7d2bf2631e81e58aff97271c325ce36bf1acc62542d96e2baf3fe26a628702516140dce94935e7303ff9e4c6
 EBUILD nnn-4.3.ebuild 1050 BLAKE2B f4c3accb8482ebec73a9af0768c20208866f527d4262e8a9127d03b1be42175dfb542ffdb1fc7e67908a57c700912532912029f332562cdc676bb1554d401a4d SHA512 db2c9a11d2a7e6d1fcdbf30e1aa948f180ab48b61d68cfc76f2ae6841b5c44953083fed8dfed7f53fb5c1a709e7f28ec732f7ce4e2b228480c16151c7ca8ac1b
+EBUILD nnn-4.5.ebuild 1050 BLAKE2B fa98a38f462e4f72947e174cafa7aaada7377e9a54d862f76f66bef59aee3f8c6ae5f3057e8aec217f2319e8f665e1b9b8ce0d18f6614cc8dca3ff80612649a3 SHA512 c896f5c94b18cd19d998fe804365ca3391ccbd3ebff1be73c1feac1b5bdc2a47011814f233fdffa89af740580f1eb7254968bbe8bab28afbab68e2c697eb64dc
 MISC metadata.xml 244 BLAKE2B 94b04f9b5ade506f66b25651b1fdabfaf11febaff3175956406893e90548e87145186ef43a617e24803bd22d9da3f90ea8d72cfea7847aea521974b3138e92ad SHA512 20225e64357a690e86df86aa4d784300459d28b775e3989f77fd31e752ef968de63e41b59bb3c78b331e817f9eceab6dd6ef01131451753a1b5d3a309770611a
diff --git a/app-misc/nnn/nnn-4.5.ebuild b/app-misc/nnn/nnn-4.5.ebuild
new file mode 100644
index 000000000000..57340dc98f35
--- /dev/null
+++ b/app-misc/nnn/nnn-4.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="The missing terminal file browser for X"
+HOMEPAGE="https://github.com/jarun/nnn"
+SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND="sys-libs/ncurses:0=
+	sys-libs/readline:0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	tc-export CC
+	sed -i -e '/install: all/install:/' Makefile || die "sed failed"
+}
+
+src_install() {
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
+
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install-desktop
+
+	newbashcomp misc/auto-completion/bash/nnn-completion.bash nnn
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins misc/auto-completion/fish/nnn.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins misc/auto-completion/zsh/_nnn
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index dad1d76e8eac..36ecbc16d01f 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 1d22a7ca3fc2..d9b0e4f00691 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,10 +1,12 @@
 AUX gnucash-3.2-no-gui.patch 440 BLAKE2B 223d9527e0f290e73774b39ee25dae2c1740d4ed8b340d5d8cdfde74734ae30ebc391ca4ef8df6b162dd53cfd1b5ae3c7d5cd64446978a86969bb5fcc9ea6440 SHA512 628d38969abd7475f88ed9013d99691768abd11a751205092e04b92183551e0dce2e32f1212f66fde47e83730e1d26addbc47d990478e8a8968f9c9f0bc041bd
 AUX gnucash-3.8-examples-subdir.patch 316 BLAKE2B 77779cebb75896e8d51981f5fc0cbc09aa51e83ea0823b1055d5e6bf9b420492f039e7e39985e405304819a46bbd178d10c2a55188e956c9b71b2c20842f947e SHA512 d4fc9a3e062ff25f65b82253c563c0d291d461b44d47f30c33a8041908a59fa23ce3e127b885690b1ec55d17222cac2c3679d49d962bb5be998f9611467e88f8
 AUX gnucash-3.8-exclude-license.patch 634 BLAKE2B d6b86102a4ced983684e75f4f4801b7da096923a65c7fca10f13e9da45adb70ac5c2c3c5af9151a14e6f1eb3a3711d6283840db232ee6113818e1f1b215be9dc SHA512 a9c43405226d2256c0b3c981e70a4fc79bd126c08089e68ac01edc86070a2936eaa3f77ac16bad94954addd2085ca0bf1c62bec3d31840559bbf213e1b530f2d
+DIST gnucash-4.10.tar.bz2 14768016 BLAKE2B 645caedc342508290bac1ed4c8745ddc84f9634887cacc49246b3b1470e1d4c34b55af5b79c23747c8e223096e2b57876635fd07bc1e9153331abd11e4e249c2 SHA512 6898edff50af360bc7112a6d8eab3cde808a127df603f2eb5dca166a8f2ea079c3d37859fcb4ea22fa3a137f71792402dbff2d3ef4d0d93b0f2c980f5b1c2a62
 DIST gnucash-4.4-Fix-build-with-glib-2.68.patch.xz 9120 BLAKE2B b04cc859ab2817b69e9a5b3b92d73dd16aa4b3264202d0d089c80251a9ead5f459c6918fc605fda50e98db01d81dc4691ae58d7ff2eb4dad8c805edb523e36eb SHA512 3aea6195f47ed4c3ca395f10b7575bcabf8f5dcb185b938ece19a518de0f0bd18e9bbe19b84eca8ec99e3a076745e441f3d47d894049f0cfb88168723338fbf0
 DIST gnucash-4.4.tar.bz2 14430959 BLAKE2B 7a9e04957919a99e083dd5c1ac04150f77ab64eef277c0cd63ef90ade4a82875447f291d4f14499a14e987a86a7b7615d4a3cbb79a980be7022cb4f511b71368 SHA512 5882e5a91081bb9279ac5dc8798352cb15ebb934d1d37c6d6639244602108e067ece5b7f51ba32c9c413c1469d08ca32a73369e6af34e41c3ef704033c71f336
 DIST gnucash-4.5.tar.bz2 14472274 BLAKE2B 2cf9726fc241506867a49f796d2526c6a7524667dcf706f812d225deac146020f49dcdc7ac64b1c0b90d6e61941197dd8aec0f5166e474bc2f601fc8674abdc1 SHA512 5e6dfebae8845ab7ad8fcb95f38eb1d0907e789637f722fccf31486b05ee9ebbfb60b8c70e1cef1fc5913b73bfdc2251babed09b6f894c266b969874f3dff30b
 DIST gnucash-4.8.tar.bz2 14679619 BLAKE2B ef0790dcf823631b3a9764d60a49a55f35614d31117b1921ad5621d8b5298928555725b4d376e4b782437f8874b438496c3fd5b610df480fcc17f5d049a07511 SHA512 5fbafabe7ddbafe5e275b058758637011712934aec875b97085b7d068ab556ae5041b2cfa83f9a735eec877fac5158b701c2255be129e8ce883acf668fadefb5
+EBUILD gnucash-4.10.ebuild 5166 BLAKE2B 06394d0b361926d5b8310096d444f42871c4fce672fdb128309d30d6c6465ba18869b11ba085b0edf332c444fd8bfacfa022dbb225be7168cf8fdb5d5af98a2b SHA512 32be59d825a1b9c136a0e22be0cdce58fdae70344f6363c9dd425cd55b3a3635cb5a8d3c9034cbef74b4b4422722079d88e7e3ec1c8e1fa209f414e290215447
 EBUILD gnucash-4.4.ebuild 5642 BLAKE2B f1aa1c1da0896a45879fb1ddf1a489ab1afaea884eb88b416981cbb924762f876a96fc844af0b2322325748cdbb29f8dda64efe6b8695a83e82c8ccfe94cd52c SHA512 45ca2c094fcf74178501183762e4c3e7c6c4408863d80ded8b538e841e888eaa9c4725bd46ec33af6a1208858932a18753c0d3d19340790f2cd23be02225ef20
 EBUILD gnucash-4.5.ebuild 5525 BLAKE2B 98c964dabe0a4540a55708b6101ad268475b7f9705faf4cd04162cc360ca0c7f9185ec8444ff26bcb8eda42abbdefd38e54275e9d7eaff82991d3993d279f49d SHA512 be97ae42003e194e6d9c93282a6f83c3598793ddeb11cc474ae3c15c0f846ee777811432b343918a3455c7b13731f6c9365a9d43fd3f1aac81fabf1c507ebd98
 EBUILD gnucash-4.8.ebuild 5417 BLAKE2B 67aba1b9a45725262da866c4fc298c20ac302b79ff7103192676e511c6d099c65c835e11044ed4f7e8493e3cb1e2c021ec9a99bfde9f3d2793d586d57e6a5b84 SHA512 2ba894014691c3cbb7918945e9c672311f324e928cf0378dea7b21ea6e589a85551313759dae3c044cbdac95cd7094f4a2cfdc77fc68b06ac75c411d2a226f36
diff --git a/app-office/gnucash/gnucash-4.10.ebuild b/app-office/gnucash/gnucash-4.10.ebuild
new file mode 100644
index 000000000000..1889940ce48b
--- /dev/null
+++ b/app-office/gnucash/gnucash-4.10.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with app-doc/gnucash-docs
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake gnome2-utils python-single-r1 xdg-utils
+
+DESCRIPTION="A personal finance manager"
+HOMEPAGE="https://www.gnucash.org/"
+SRC_URI="https://github.com/Gnucash/gnucash/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+IUSE="aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres
+	  python quotes register2 smartcard sqlite test"
+RESTRICT="!test? ( test )"
+
+# Examples doesn't build unless GUI is also built
+REQUIRED_USE="
+	examples? ( gui )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	smartcard? ( aqbanking )"
+
+# dev-libs/boost must always be built with nls enabled.
+# net-libs/aqbanking dropped gtk with v6. So, to simplify the
+#   dependency, we just rely on that.
+RDEPEND="
+	>=dev-libs/glib-2.56.1:2
+	>=dev-scheme/guile-2.2.0:=[regex]
+	>=sys-libs/zlib-1.1.4
+	dev-libs/boost:=[icu,nls]
+	dev-libs/icu:=
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	aqbanking? (
+		>=net-libs/aqbanking-6[ofx?]
+		sys-libs/gwenhywfar:=
+		smartcard? ( sys-libs/libchipcard )
+	)
+	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+	gui? (
+		>=x11-libs/gtk+-3.22.30:3
+		gnome-base/dconf
+		net-libs/webkit-gtk:4=
+		aqbanking? ( sys-libs/gwenhywfar:=[gtk] )
+	)
+	mysql? (
+		dev-db/libdbi
+		dev-db/libdbi-drivers[mysql]
+	)
+	ofx? ( >=dev-libs/libofx-0.9.1:= )
+	postgres? (
+		dev-db/libdbi
+		dev-db/libdbi-drivers[postgres]
+	)
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pygobject[${PYTHON_USEDEP}]
+		')
+	)
+	quotes? (
+		>=dev-perl/Finance-Quote-1.11
+		dev-perl/Date-Manip
+		dev-perl/HTML-TableExtract
+	)
+	sqlite? (
+		dev-db/libdbi
+		dev-db/libdbi-drivers[sqlite]
+	)
+"
+
+DEPEND="${RDEPEND}
+	>=dev-cpp/gtest-1.8.0
+	>=sys-devel/gettext-0.20
+	dev-lang/perl
+	dev-perl/XML-Parser
+	sys-devel/libtool
+"
+
+BDEPEND="
+	dev-lang/swig
+	dev-util/cmake
+	virtual/pkgconfig
+	|| (
+		>=sys-devel/gcc-8:*
+		>=sys-devel/clang-6:*
+	)
+"
+
+# For 4.10, they released gnucash-docs-4.10.1 to fix an issue.
+PDEPEND="doc? (
+	~app-doc/gnucash-docs-${PV}.1
+	gnome-extra/yelp
+)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.8-examples-subdir.patch
+	"${FILESDIR}"/${PN}-3.8-exclude-license.patch
+)
+
+S="${WORKDIR}/${PN}-$(ver_cut 1-2)"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Fix tests writing to /tmp
+	local fixtestfiles=(
+		gnucash/report/test/test-report-html.scm
+		gnucash/report/reports/standard/test/test-invoice.scm
+		gnucash/report/reports/standard/test/test-new-owner-report.scm
+		gnucash/report/reports/standard/test/test-owner-report.scm
+		gnucash/report/reports/standard/test/test-transaction.scm
+		gnucash/report/reports/standard/test/test-portfolios.scm
+		gnucash/report/reports/standard/test/test-charts.scm
+		gnucash/report/test/test-report.scm
+		gnucash/report/test/test-commodity-utils.scm
+		gnucash/report/test/test-report-extras.scm
+		libgnucash/backend/dbi/test/test-backend-dbi-basic.cpp
+		libgnucash/backend/xml/test/test-xml-pricedb.cpp
+	)
+	for x in "${fixtestfiles[@]}"; do
+		sed -i -e "s|\"/tmp/|\"${T}/|g" "${S}/${x}" || die "sed of "${S}/${x}" failed"
+	done
+}
+
+src_configure() {
+	export GUILE_AUTO_COMPILE=0
+
+	local sql_on_off="OFF"
+	if use mysql || use postgres || use sqlite ; then
+		sql_on_off="ON"
+	fi
+
+	local mycmakeargs=(
+		-DCOMPILE_GSCHEMAS=OFF
+		-DDISABLE_NLS=$(usex !nls)
+		-DENABLE_REGISTER2=$(usex register2)
+		-DWITH_AQBANKING=$(usex aqbanking)
+		-DWITH_OFX=$(usex ofx)
+		-DWITH_PYTHON=$(usex python)
+		-DWITH_SQL=${sql_on_off}
+		-DWITH_GNUCASH=$(usex gui)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	LOCALE_TESTS=
+	if type locale >/dev/null 2>&1; then
+		MY_LOCALES="$(locale -a)"
+		if [[ "${MY_LOCALES}" != *en_US* ||
+				"${MY_LOCALES}" != *en_GB* ||
+				"${MY_LOCALES}" != *fr_FR* ]] ; then
+			ewarn "Missing one or more of en_US, en_GB, or fr_FR locales."
+		else
+			LOCALE_TESTS=true
+		fi
+	else
+		ewarn "'locale' not found."
+	fi
+
+	if [[ ! ${LOCALE_TESTS} ]]; then
+		ewarn "Disabling test-qof and test-gnc-numeric."
+		echo 'set(CTEST_CUSTOM_TESTS_IGNORE test-qof test-gnc-numeric)' \
+			> "${BUILD_DIR}"/CTestCustom.cmake || die
+	fi
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# strip is unable to recognise the format of the input files (*.go)
+	dostrip -x /usr/$(get_libdir)/guile
+
+	if use examples ; then
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+		rm -r "${ED}"/usr/share/doc/${PF}/examples
+	fi
+
+	if use python ; then
+		python_optimize
+		python_optimize "${ED}"/usr/share/gnucash/python
+	fi
+}
+
+pkg_postinst() {
+	if use gui ; then
+		xdg_icon_cache_update
+		gnome2_schemas_update
+	fi
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	ewarn "Backup all financial files or databases before using GnuCash >=2.7.0!"
+	ewarn
+	ewarn "GnuCash 2.7.0 introduced large changes in its file format and database"
+	ewarn "schema that WILL prevent you from reverting back to GnuCash 2.6."
+}
+
+pkg_postrm() {
+	if use gui ; then
+		xdg_icon_cache_update
+		gnome2_schemas_update
+	fi
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 6a2e34c9d204..05245f49bf50 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,4 +1,7 @@
+AUX lyx-2.3.6.1-gcc12.patch 493 BLAKE2B 47d74d13381689127bd2c53e7ef7bdd50231ff73063f2571ad37a009dcfd4e64146b86461e7d537b22104ad59daf38c8b55f9189ca3103850abdaa704bff98f0 SHA512 3fe53f7da7db7159f1dcd5d989451d09d0408234d4ec9584feb8167689d9465ee91672cf7090172724ad7919ba70d03d95f18d0e195de5f3312a19bd783377e7
+AUX lyx-2.3.6.1-python.patch 2294 BLAKE2B 1980fe19607577d6b7462aaa4a049a41cbc329e881889cdee673df1bf57d7ab0dbfb8bd9aa705e23a88b1c195bd660f04efb519c9371167939e946c099b7784d SHA512 6f41de389bce14d8ef1c695268f6d6540276fe44d4871a14458f7ef38e6b4f4cb90877310d82df5550d537f39f65eded489722de24eb99ea6d83d8ec92dd7b71
 AUX lyx-prefer-xdg-open.patch 3470 BLAKE2B f989c3455d4cfb332d36edbca9b3bcc0208709d361696f04bdd565ea455104d1809877bdb85a362e950c2d48159c52d9a1a69c92d79f075269cfc9ccfceee4d7 SHA512 d17a2af0d75b6dcca06c1d31e615b814df3e75c3039c7ff5a14ab270b7cb75ab6f42ec851db7c804c90b7724a95eeec02d74de5c7511523c8400f0d50c2c0ce3
 DIST lyx-2.3.6.1.tar.xz 16242608 BLAKE2B d59c6db79d7760902f93405e3737974fa9c6bd79c5ab4b02010021532903c76a77701f1f99a0838b4379c548f3f37dcdd9eeb492b733c4162162d868d1d92970 SHA512 233f6c54d4a036ad12f33c6705810bfb99747bdbd015550a8a0a9d7b664d3be50a06dc337191b820c42de4407c5f790efa50c706a45fb2260a71f772fb22c872
 EBUILD lyx-2.3.6.1-r1.ebuild 4225 BLAKE2B e6161f23359183ababfd96d0256e41328a695df0c9853722a22f478011c4e18e4653bb735e3d4c49b3671d5d726d3b69c6f33befbe0de7ba6a88691b1d22b48b SHA512 7732d152029275f1cce442c38873748768eafec3e1fe4bac2fde78c77d98f49abb4e1df4cdb5cc21192208d6da4e43eb5b0e361f90e1a8e83bef67efaca4054e
+EBUILD lyx-2.3.6.1-r2.ebuild 4285 BLAKE2B 7cc00cf554f20bc5766629cfd7f2d240ac4936df171d98edea280f0f65962825babcb1aa6c0d7a85bfdd1b3035c528cd4ae19b86e5889679d404a07f67c8bba1 SHA512 c752b1590beb2a534dfc4e0a851a5bf9388c52da4c8aebcdc0a91cf0ddcc0f53ddf08bdaaaa904e5bec922e8c8a9e5186e399cfc9c1ea31be4cd409ed54b52aa
 MISC metadata.xml 1270 BLAKE2B eaaaa462e91ba2e33dfd7e8507de5b8b2e392f3db01c761580b055407c65844ca4297db70e539b5c7db6a1420f2a30c0f75ddc25d160a78e598475bf36912f32 SHA512 d8f5361766f37c679b58ad329b24632ee11fe0ddce26aaf5cdfb1bd21a56214c6bff6076c8ba9e3584bfbe086e49ce9c4c7e0ba44e38deeaa33e11b6f5a6274a
diff --git a/app-office/lyx/files/lyx-2.3.6.1-gcc12.patch b/app-office/lyx/files/lyx-2.3.6.1-gcc12.patch
new file mode 100644
index 000000000000..b1acbdb9087d
--- /dev/null
+++ b/app-office/lyx/files/lyx-2.3.6.1-gcc12.patch
@@ -0,0 +1,22 @@
+https://src.fedoraproject.org/rpms/lyx/raw/rawhide/f/lyx-2.3.6-fix-gcc12.patch
+https://bugs.gentoo.org/841743
+--- a/src/insets/InsetListings.cpp
++++ b/src/insets/InsetListings.cpp
+@@ -44,6 +44,7 @@
+ 
+ #include "support/regex.h"
+ 
++#include <cstring>
+ #include <sstream>
+ 
+ using namespace std;
+--- a/src/lyxfind.cpp
++++ b/src/lyxfind.cpp
+@@ -52,6 +52,7 @@
+ #include "support/lstrings.h"
+ 
+ #include "support/regex.h"
++#include <iterator>
+ 
+ using namespace std;
+ using namespace lyx::support;
diff --git a/app-office/lyx/files/lyx-2.3.6.1-python.patch b/app-office/lyx/files/lyx-2.3.6.1-python.patch
new file mode 100644
index 000000000000..666d82c06bf8
--- /dev/null
+++ b/app-office/lyx/files/lyx-2.3.6.1-python.patch
@@ -0,0 +1,50 @@
+https://src.fedoraproject.org/rpms/lyx/raw/054d18eb79a8ec3d4480ab4449b3c62b12770d2d/f/lyx-2.3.6-layout2layout.patch
+--- a/lib/scripts/layout2layout.py
++++ b/lib/scripts/layout2layout.py
+@@ -256,7 +256,7 @@
+ 
+ def trim_bom(line):
+     " Remove byte order mark."
+-    if line[0:3] == "\357\273\277":
++    if line[0:3] == b"\357\273\277":
+         return line[3:]
+     else:
+         return line
+@@ -345,8 +345,8 @@
+     # for categories
+     re_Declaration = re.compile(b'^#\\s*\\Declare\\w+Class.*$')
+     re_ExtractCategory = re.compile(b'^(#\\s*\\Declare\\w+Class(?:\\[[^]]*?\\])?){([^(]+?)\\s+\\(([^)]+?)\\)\\s*}\\s*$')
+-    ConvDict = {"article": "Articles", "book" : "Books", "letter" : "Letters", "report": "Reports", \
+-                "presentation" : "Presentations", "curriculum vitae" : "Curricula Vitae", "handout" : "Handouts"}
++    ConvDict = {b"article": b"Articles", b"book" : b"Books", b"letter" : b"Letters", b"report": b"Reports", \
++                b"presentation" : b"Presentations", b"curriculum vitae" : b"Curricula Vitae", b"handout" : b"Handouts"}
+     # Arguments
+     re_OptArgs = re.compile(b'^(\\s*)OptionalArgs(\\s+)(\\d+)\\D*$', re.IGNORECASE)
+     re_ReqArgs = re.compile(b'^(\\s*)RequiredArgs(\\s+)(\\d+)\\D*$', re.IGNORECASE)
+@@ -485,7 +485,7 @@
+                 continue
+             col  = match.group(2)
+             if col == "collapsable":
+-                lines[i] = match.group(1) + "collapsible"
++                lines[i] = match.group(1) + b"collapsible"
+             i += 1
+             continue
+ 
+@@ -703,7 +703,7 @@
+             # Insert the required number of arguments at the end of the style definition
+             match = re_End.match(lines[i])
+             if match:
+-                newarg = ['']
++                newarg = [b'']
+                 # First the optionals (this is the required order pre 2.1)
+                 if opts > 0:
+                     if opts == 1:
+@@ -1153,7 +1153,7 @@
+             if latextype == b"item_environment" and label.lower() == b"counter_enumi":
+                 lines[labeltype_line] = re_LabelType.sub(b'\\1\\2\\3Enumerate', lines[labeltype_line])
+                 # Don't add the LabelCounter line later
+-                counter = ""
++                counter = b""
+ 
+             # Replace
+             #
diff --git a/app-office/lyx/lyx-2.3.6.1-r2.ebuild b/app-office/lyx/lyx-2.3.6.1-r2.ebuild
new file mode 100644
index 000000000000..a8d622193e27
--- /dev/null
+++ b/app-office/lyx/lyx-2.3.6.1-r2.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+MY_P="${P/_}"
+inherit desktop font python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc"
+HOMEPAGE="https://www.lyx.org/"
+SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${MY_P}.tar.xz
+	ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.3/${MY_P}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="aspell cups debug dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf svg l10n_he"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# bc needed http://comments.gmane.org/gmane.editors.lyx.devel/137498 and bug #787839
+BDEPEND="
+	sys-devel/bc
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="${PYTHON_DEPS}
+	app-text/mythes
+	dev-libs/boost:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-texlive/texlive-fontsextra
+	sys-apps/file
+	sys-libs/zlib
+	virtual/imagemagick-tools[png,svg?]
+
+	x11-misc/xdg-utils
+
+	aspell? ( app-text/aspell )
+	cups? ( net-print/cups )
+	dia? ( app-office/dia )
+	dot? ( media-gfx/graphviz )
+	enchant? ( app-text/enchant:2 )
+	gnumeric? ( app-office/gnumeric )
+	html? ( dev-tex/html2latex )
+	hunspell? ( app-text/hunspell )
+	l10n_he? ( dev-tex/culmus-latex )
+	latex? (
+		app-text/dvipng
+		app-text/ghostscript-gpl
+		app-text/ps2eps
+		app-text/texlive
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-mathscience
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-plaingeneric
+		|| (
+			dev-tex/hevea
+			dev-tex/latex2html
+			dev-tex/tex4ht[java]
+			dev-tex/tth
+		)
+	)
+	rcs? ( dev-vcs/rcs )
+	rtf? (
+		app-text/unrtf
+		dev-tex/html2latex
+		dev-tex/latex2rtf
+	)
+	svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+"
+
+DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
+
+S="${WORKDIR}/${MY_P}"
+
+FONT_S="${S}/lib/fonts"
+FONT_SUFFIX="ttf"
+
+PATCHES=(
+	# Try first with xdg-open before hardcoded commands
+	# Patch from Debian using a similar approach to Fedora
+	"${FILESDIR}"/${PN}-prefer-xdg-open.patch
+
+	"${FILESDIR}"/${P}-python.patch
+	"${FILESDIR}"/${P}-gcc12.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	font_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	sed "s:python -tt:${EPYTHON} -tt:g" -i lib/configure.py || die
+}
+
+src_configure() {
+	tc-export CXX
+	#bug 221921
+	export VARTEXFONTS="${T}"/fonts
+
+	econf \
+		$(use_with aspell) \
+		$(use_enable debug) \
+		$(use_with enchant) \
+		$(use_with hunspell) \
+		$(use_enable monolithic-build) \
+		$(use_enable nls) \
+		--enable-qt5 \
+		--with-qt-dir=$(qt5_get_libdir)/qt5 \
+		--disable-stdlib-debug \
+		--without-included-boost \
+		--with-packaging=posix
+}
+
+src_install() {
+	default
+
+	if use l10n_he ; then
+		echo "\bind_file cua" > "${T}"/hebrew.bind || die
+		echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind || die
+
+		insinto /usr/share/lyx/bind
+		doins "${T}"/hebrew.bind
+	fi
+
+	newicon -s 32 "development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png
+	doicon -s 48 "lib/images/lyx.png"
+	doicon -s scalable "lib/images/lyx.svg"
+
+	# fix for bug 91108
+	if use latex ; then
+		dosym ../../../lyx/tex /usr/share/texmf-site/tex/latex/lyx
+	fi
+
+	# fonts needed for proper math display, see also bug #15629
+	font_src_install
+
+	python_fix_shebang "${ED}"/usr/share/${PN}
+
+	if use hunspell ; then
+		dosym ../myspell /usr/share/lyx/dicts
+		dosym ../myspell /usr/share/lyx/thes
+	fi
+}
+
+pkg_postinst() {
+	font_pkg_postinst
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+
+	# fix for bug 91108
+	if use latex ; then
+		texhash || die
+	fi
+
+	# instructions for RTL support. See also bug 168331.
+	if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; then
+		elog
+		elog "Enabling RTL support in LyX:"
+		elog "If you intend to use a RTL language (such as Hebrew or Arabic)"
+		elog "You must enable RTL support in LyX. To do so start LyX and go to"
+		elog "Tools->Preferences->Language settings->Language"
+		elog "and make sure the \"Right-to-left language support\" is checked"
+		elog
+	fi
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+
+	if use latex ; then
+		texhash || die
+	fi
+}
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 5fd3094089a4..9f420795badd 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index fba8c870644a..2b5f3c5e395a 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,5 +1,5 @@
 DIST bash-completion-2.11.tar.xz 311004 BLAKE2B 98e3ab6669bd70b49b238a597f1bc1309dc7ddd51c5b17c5e054f9161115d75d26e85d547471bc087e070d10554448b790a6dfb557abc413b70079ecc94acce3 SHA512 41585f730b5114d397831ba36d10d05643c6a6179e746ddc49aa1cbef61ea5525fd2f09b2e474adee14e647f99df8d5983ee48e29a59d8a30e1daf7fb1837e06
 DIST bashcomp-2.0.3.tar.gz 3539 BLAKE2B 75304d144792cc7f6ad5455a05a65c33c646d6f7384d020a06a1fcf012cd51625a3dd0750ad539253453b1eede196c340286a1e81737f0835b5091609ba01295 SHA512 b2bd185ccbd4456939ccc731cc1983fcec2b9564a9920642a753fadd5d897fdb96b925ac1524657629d621d45b37d99076c8ae72511a827e96ff6c388d720008
-EBUILD bash-completion-2.11.ebuild 4057 BLAKE2B 1b13f3fc13428fdcc693e5573c3b98c933ce7c9335cc5a0df89b4824d2f8579450cea5f46624510d5693448db82cb61b13a3d0cc1d13f4c884ad04bf78774ef8 SHA512 c5b4918bc3caf1d980cba96bc3f6619449aa5999d5da0dabf706ccb9cdf13f04b1dbb803baa41e2f0122eba7e2cb90e1079723eb510310b68b62538e93357075
-EBUILD bash-completion-9999.ebuild 3999 BLAKE2B edea4d0e930865fa3a397c3d09651e452bec605ebc8e25a1963e59eab7bb6c9fc8e18d36fbb8ff83ee704f7cd9102ded0e6e41d89b35c440bb2a32b69e335107 SHA512 24cd7dceb2fa9c54c1ad4e0d5ce701a2c4b264caf587ce3d50c86879210bc4552b2116c5bc0264612e212b0dd5c1ed9e145f51ef9bfafbbda2f651ee048c6416
+EBUILD bash-completion-2.11.ebuild 4058 BLAKE2B ad6c7368a40d58284a97d0a87e5953fa7da88518dfe5f749ae0434b70227df668262bb6fa1a4254355338369d34072b52f608a514997a3fd165be554d5ad056c SHA512 cabc950e6619cf4289dec3b11816a83ab2cc8ed090a11fdc8a5c3a024d0fac359240791c4e3b9268a92a064621feb0b6b903ff54e67a141bd7cabccb6cf17c19
+EBUILD bash-completion-9999.ebuild 4000 BLAKE2B 554b63e9598a05197aec76fe1f90cdebe9bf4208bba0e0d82a29e22e6cfa8d1ef8e9112704314e3cd1db55b470982cbfea72c3d68e590ed40df664267810d292 SHA512 edfac3e11c5314ab72143731b949f463ca0ce476c29a7b168ed34dbaee51c1114af87a5b9a9d9c0d00e0e1fe589ff24e1c8eed9cb2c95ae8728cfd738d7ffdd6
 MISC metadata.xml 1440 BLAKE2B 8625e1d03d02f201030c22cfe4147f09e81bffa72b0836246f4be670f55e454597c2f00123c25bbe8f92b2f756b16d4bab62917a77fbc3fff8ba2e3986424595 SHA512 16ecd8fcc7eeb3043b158820f92b031296239e557cb96a1db14127b3100072d7a0bb0abb7446c9e219097be02128e705b792f27aa35ab461c87cff50f2e742fb
diff --git a/app-shells/bash-completion/bash-completion-2.11.ebuild b/app-shells/bash-completion/bash-completion-2.11.ebuild
index 4c55e7352304..77dfb81a73bd 100644
--- a/app-shells/bash-completion/bash-completion-2.11.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.11.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 BASHCOMP_P=bashcomp-2.0.3
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit bash-completion-r1 python-any-r1 user-info
 
 DESCRIPTION="Programmable Completion for bash"
diff --git a/app-shells/bash-completion/bash-completion-9999.ebuild b/app-shells/bash-completion/bash-completion-9999.ebuild
index 2f4caf5b89e1..05fd91a33670 100644
--- a/app-shells/bash-completion/bash-completion-9999.ebuild
+++ b/app-shells/bash-completion/bash-completion-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit autotools git-r3 python-any-r1 user-info
 
 DESCRIPTION="Programmable Completion for bash"
diff --git a/app-shells/pwsh-bin/Manifest b/app-shells/pwsh-bin/Manifest
index 4a79157ba9f5..91626704b7ef 100644
--- a/app-shells/pwsh-bin/Manifest
+++ b/app-shells/pwsh-bin/Manifest
@@ -1,13 +1,5 @@
-DIST powershell-7.1.4-linux-arm32.tar.gz 64878390 BLAKE2B 5fd82e562b5db20f7d0b5335969eca6a0821bc7ee23aca6d60a0ef9f7fbf4888d515f8a1fabd5b5fdf8de6418abcfbad481bec5b3dd4635f072007ebc6ecb634 SHA512 cd48f644f483dcc8594aba1220912f731345cfe0316ef21ec1663d16fc36e95d2c6891a742bade31f3450e3cedbe689f7804ae8f90737ae23d04a39adb6c4171
-DIST powershell-7.1.4-linux-arm64.tar.gz 63726773 BLAKE2B f59c75a8dfd9d12f7c41c3035524a4c9991923dfc04e8eb61f8440de1d110932c769f84806fb2b33a9179817d57179e1c70de7b3199c78023d75f22fbaad5a83 SHA512 7eca9d5c6cfe57b0920a49d4f22499f509c1125a5a91876f17bcadd1a6e049bf3bc9d0abf0bb460823d06b67c8c065abf100c8f989353c7f28f993c07b44005f
-DIST powershell-7.1.4-linux-x64.tar.gz 68255681 BLAKE2B 7a57298cdea29e430b67cad965d16f533fab67aaf7009db8cd68683f5e987dab48f12c779c87a0a1538a1ecf7ed2be25011578b7491a092d86f7d386ec8ac6a4 SHA512 b15098a1ab1fc357f0351fc2146e6be3f060ef90dd38ced2e3379b24a0bcb4f28a7c4c655509e62824c56ce905162a7c81bd0a853c5320bd8139a3a4178b97a1
-DIST powershell-7.2.0-linux-arm32.tar.gz 66486780 BLAKE2B ffc23554feca1e26da15e5c672a3eb9bc25befdbfe64f812cd80fd6820c94b94a8719170878e7852d6b48a7538295fa231b24f4f51013c0288c84a5990a0af1f SHA512 2d618c4600128011575e00e20437bf9a417b6fd60cfdb8450b218d17d1a0bed3f3e35bbd6a050ca1eb8d03a22995712cc739d73bcb03e22a494ffac1934c18eb
-DIST powershell-7.2.0-linux-arm64.tar.gz 65020702 BLAKE2B bfb7fc46efe62252290cef124030bdcb24511c219c797e344bc4deb452b2051ef5b0d23977547efcba755eb11c6282b9fe9121cc6451e04cc640228e499bd08d SHA512 dcf534471b5ef909ec989496224bedd4b4a0c38ff8a7d7d81e9b01be68c9b1141ff76b2de3dd9f36b51277165c3cfa5a2c80b2a23c6204dc5d1a09dae40c8761
-DIST powershell-7.2.0-linux-x64.tar.gz 69653102 BLAKE2B 5a85f49f675047c86928fb733d12462351a25c079876c4d0a37ddc36f5a4ecf91fb3009b625f156f291099c51e189638e10bed51763e8fd458b70160f5ce8d61 SHA512 f07a038ef8e7c4894f78139c08739a605ce0deb79d2f0e9d5abb8be5fda31a1636804c99c0dceedd5798e08e353263c338b98b7477eb40ebfb875545b0cbf3fb
 DIST powershell-7.2.1-linux-arm32.tar.gz 66500447 BLAKE2B 2390a26c871abf7012834d8401b6d1afd4c290c7a68794454c2926c782e4ddc20165d1f50718f2ec2b268bcfc2414bc454e211f3bf1eb3c77eb4939e52b7d846 SHA512 29f6c1a926c8cff6386e4d98ce91ec4ff91c19d0cd4cacdc8d3da1c65858841695a466e0a1c9106df6da1fa7d79ac96de023e564be6ba1ac00d5c94216380ed8
 DIST powershell-7.2.1-linux-arm64.tar.gz 65023197 BLAKE2B 8acd526537695e29d44d4e7445dd4fce1c0b2bb8a2cda57c353d7e21aac4efe85aa9e6752d71afb276f5035d0951e5f5684ea88751a25848387e4d5ea37d36a5 SHA512 094659aa63e2f4728997eaa086f1a74f34eb4876f1e679cb595a0c07c4133b42fbeb45fafbd3b916df8529a63fe98e2ffc54b0de66f3c8d17d9d72e03d35f0b8
 DIST powershell-7.2.1-linux-x64.tar.gz 69668637 BLAKE2B c173216df2147e5f857533cf35a6adaafe8e34f3b475bab6696c09f118ea62fd8304f25bbcfc9ef07807aee87f44ed0829d170ca878039a3ade5853235b61e82 SHA512 63a84dae492c0f1ef13629a50bf5b33fa9d5dd8d0d878a2e1dce185b398ef39467498ae7ea75b78326fb4c669fa77bea0549280fb6669e28cb0191a48fc374de
-EBUILD pwsh-bin-7.1.4.ebuild 1287 BLAKE2B bdb3b0a23c1a221c63bee62aadf77d9693c1150deb72cb22b57667757722c6d9fa23983fda501b337b8a481bccce5560254e04ad12a5b2d6757b585fa9ce3a6e SHA512 e710923e2d519e16fa5a54426f1c5ecba30f1cd66049392908b64a254ff5c951656c648b1b22aaec91ac7bbab96d0b0308862cd8bf476f0fbd70b2b722d82ae5
-EBUILD pwsh-bin-7.2.0.ebuild 1287 BLAKE2B bdb3b0a23c1a221c63bee62aadf77d9693c1150deb72cb22b57667757722c6d9fa23983fda501b337b8a481bccce5560254e04ad12a5b2d6757b585fa9ce3a6e SHA512 e710923e2d519e16fa5a54426f1c5ecba30f1cd66049392908b64a254ff5c951656c648b1b22aaec91ac7bbab96d0b0308862cd8bf476f0fbd70b2b722d82ae5
 EBUILD pwsh-bin-7.2.1.ebuild 1287 BLAKE2B bdb3b0a23c1a221c63bee62aadf77d9693c1150deb72cb22b57667757722c6d9fa23983fda501b337b8a481bccce5560254e04ad12a5b2d6757b585fa9ce3a6e SHA512 e710923e2d519e16fa5a54426f1c5ecba30f1cd66049392908b64a254ff5c951656c648b1b22aaec91ac7bbab96d0b0308862cd8bf476f0fbd70b2b722d82ae5
-MISC metadata.xml 626 BLAKE2B c3e343aaa8fe2ec1f7ec144a3166e5ac491e8621fc92a7d05d02016b122de7e94008ef5c9001c87b94fd6e1ca3ae9111dffdc5529413c6e40c0648c112eb8c52 SHA512 be17be51024269bda318601aa1a852a2b14309c975523bd6f4a928aa4f0a37309fb19de58cab1ee92f90fca0dd2b65e739b8c38215c0bbaec02014d0f8a69c3e
+MISC metadata.xml 575 BLAKE2B 8c5e4cc4fd5126ec3d44a4e5b4ff89d64a484239a19a517d5eaf987ac844ed5c1461d5cc06df4d32174ad0f21bb6d96d91019706951fb3724e8eb7a27a8264be SHA512 6dbd1fb05c3e8807145ff1fe5cc6cce7fb430e765bc6fe5f2235a26e27cc57263486466ec9fe96f924a32353e0fe2b651e972f4eb4e7677556f7b080526da0c0
diff --git a/app-shells/pwsh-bin/metadata.xml b/app-shells/pwsh-bin/metadata.xml
index 4649b591e19f..999ba4555e91 100644
--- a/app-shells/pwsh-bin/metadata.xml
+++ b/app-shells/pwsh-bin/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>dotnet@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<changelog>https://github.com/PowerShell/PowerShell/blob/master/CHANGELOG/7.1.md</changelog>
 		<doc>https://powershell.org/free-resources/</doc>
diff --git a/app-shells/pwsh-bin/pwsh-bin-7.1.4.ebuild b/app-shells/pwsh-bin/pwsh-bin-7.1.4.ebuild
deleted file mode 100644
index b3bb0706496a..000000000000
--- a/app-shells/pwsh-bin/pwsh-bin-7.1.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="PowerShell - binary precompiled for glibc"
-HOMEPAGE="https://powershell.org/"
-LICENSE="MIT"
-QA_PREBUILT="*"
-SRC_URI="
-	amd64? ( https://github.com/PowerShell/PowerShell/releases/download/v${PV}/powershell-${PV}-linux-x64.tar.gz )
-	arm?   ( https://github.com/PowerShell/PowerShell/releases/download/v${PV}/powershell-${PV}-linux-arm32.tar.gz )
-	arm64? ( https://github.com/PowerShell/PowerShell/releases/download/v${PV}/powershell-${PV}-linux-arm64.tar.gz )
-"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-RDEPEND="
-	app-crypt/mit-krb5:0/0
-	dev-util/lttng-ust:0
-	|| ( dev-libs/openssl-compat:1.0.0 =dev-libs/openssl-1.0*:0/0 )
-	sys-libs/pam:0/0
-	sys-libs/zlib:0/1
-	pwsh-symlink? ( !app-shells/pwsh )
-"
-IUSE="+pwsh-symlink"
-REQUIRED_USE="elibc_glibc"
-
-S=${WORKDIR}
-
-src_install() {
-	local dest=opt/pwsh broken_symlinks=(libcrypto.so.1.0.0 libssl.so.1.0.0) symlink
-	dodir "${dest}"
-
-	for symlink in "${broken_symlinks[@]}"; do
-		[[ -L ${symlink} ]] && { rm "${symlink}" || die; }
-	done
-
-	mv "${S}/"* "${ED}/${dest}/" || die
-	fperms 0755 "/${dest}/pwsh"
-
-	dosym "../../${dest}/pwsh" "/usr/bin/pwsh-bin"
-	use pwsh-symlink && dosym "../../${dest}/pwsh" "/usr/bin/pwsh"
-}
diff --git a/app-shells/pwsh-bin/pwsh-bin-7.2.0.ebuild b/app-shells/pwsh-bin/pwsh-bin-7.2.0.ebuild
deleted file mode 100644
index b3bb0706496a..000000000000
--- a/app-shells/pwsh-bin/pwsh-bin-7.2.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="PowerShell - binary precompiled for glibc"
-HOMEPAGE="https://powershell.org/"
-LICENSE="MIT"
-QA_PREBUILT="*"
-SRC_URI="
-	amd64? ( https://github.com/PowerShell/PowerShell/releases/download/v${PV}/powershell-${PV}-linux-x64.tar.gz )
-	arm?   ( https://github.com/PowerShell/PowerShell/releases/download/v${PV}/powershell-${PV}-linux-arm32.tar.gz )
-	arm64? ( https://github.com/PowerShell/PowerShell/releases/download/v${PV}/powershell-${PV}-linux-arm64.tar.gz )
-"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-RDEPEND="
-	app-crypt/mit-krb5:0/0
-	dev-util/lttng-ust:0
-	|| ( dev-libs/openssl-compat:1.0.0 =dev-libs/openssl-1.0*:0/0 )
-	sys-libs/pam:0/0
-	sys-libs/zlib:0/1
-	pwsh-symlink? ( !app-shells/pwsh )
-"
-IUSE="+pwsh-symlink"
-REQUIRED_USE="elibc_glibc"
-
-S=${WORKDIR}
-
-src_install() {
-	local dest=opt/pwsh broken_symlinks=(libcrypto.so.1.0.0 libssl.so.1.0.0) symlink
-	dodir "${dest}"
-
-	for symlink in "${broken_symlinks[@]}"; do
-		[[ -L ${symlink} ]] && { rm "${symlink}" || die; }
-	done
-
-	mv "${S}/"* "${ED}/${dest}/" || die
-	fperms 0755 "/${dest}/pwsh"
-
-	dosym "../../${dest}/pwsh" "/usr/bin/pwsh-bin"
-	use pwsh-symlink && dosym "../../${dest}/pwsh" "/usr/bin/pwsh"
-}
diff --git a/app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild b/app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild
index 9c42e12682d8..3b98813d5a1e 100644
--- a/app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild
+++ b/app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.shlomifish.org/open-source/projects/docmake/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc64 ~riscv ~sparc x86"
 
 RDEPEND="dev-perl/Class-XSAccessor
 	virtual/perl-Getopt-Long
diff --git a/app-text/App-XML-DocBook-Builder/Manifest b/app-text/App-XML-DocBook-Builder/Manifest
index 153906a9e16f..601c8a6a640d 100644
--- a/app-text/App-XML-DocBook-Builder/Manifest
+++ b/app-text/App-XML-DocBook-Builder/Manifest
@@ -1,3 +1,3 @@
 DIST App-XML-DocBook-Builder-0.1003.tar.gz 18414 BLAKE2B d9a9442c46e171fdd8cd11cb997b8f1dd6ddd92c1ca03f0430be01828c0b46439a3aa14f6d68c2550f21bdee17871a8b314c2f1712b7810344d3a8385e9fea8d SHA512 421fdb84c2d9373ccdefa6b490bba1a78660414d27f470fbad48ac48178e3cb383345cd63a232bcf4ce13561e6775ff97397f5ab06c6142e1d8da34a92d6dcbb
-EBUILD App-XML-DocBook-Builder-0.100.300-r1.ebuild 596 BLAKE2B f60493cb366c233fe31fbbbc9baa1e3a202227729e7185e73b39abb5cf5e33a4c9c1a40b4b544910a27633cfcc32e99b07dd01ffbca114db9f74914a3054e722 SHA512 3eb379fc96f135eb4e4e921d9dbe84d61c8a999d5c083969a91870d832bd083572a313a6f5b2dfe0f85f445e8d90f610c01572e2a9190561dff81ceb26cade08
+EBUILD App-XML-DocBook-Builder-0.100.300-r1.ebuild 595 BLAKE2B 75737da516866511ca92b570843311d2c0754771ddaa4756e53868868b693882894a5c9fae6f357038da773df163f1313d3d467a78b2129df1038faab4020d23 SHA512 605324c456bea340288366e0f6c18f3b17de3c6dd76b8c7c2431014e9a06a74875af10774e1ac88d0efcc2b7a98ef28e26c6a40e72f3ed1057a291cccd1e8cd1
 MISC metadata.xml 375 BLAKE2B 7b6956381a455fffbe920a0706a91819fd70eac409a10a32c7c609a85dfef6bf97a64d2781dcac0bb624fa64be2b56b8f1e2f2dc9d42b728c019e514839f6492 SHA512 dd707b431ec91e6cb9da5dc0e2b21937739e480d0e3f2fb42f8236d7f9c1bbe1f8e2f3d95b506c49c3a982b4769eb441eb306310b82cb425a4550b51728f6a1c
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 2257c37ff3a7..9192c01d4306 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 31a69618a248..78ed7489b531 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 33266b31b00e..336a9d46daec 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -2,12 +2,15 @@ DIST sqlite-doc-3380000.zip 10603776 BLAKE2B f196b00cce01672dc1a27a64d70669ff87c
 DIST sqlite-doc-3380100.zip 10615296 BLAKE2B fa3df2458b9c15d5f7ce8abb02eb050dddb618c6e87cd79e1979612649be53de4ed26d2bb3e1230e43d7fb1293e1d5bfa870d211195a9b7c2a11a97d417d1ab6 SHA512 ccdfee3d07f2c43b6dda52a2240fd3e72ada38be5a644d097b23116e1b0c2e21f539bf56afbae30fc4275b9b4a954393f95b0a5272bcf18c98e1538d190ff6bc
 DIST sqlite-doc-3380200.zip 10620764 BLAKE2B 81f7e7b9aef37bdae133c4d7dc517d2040d8202a7e0cdf00180d3abe3fb677c80dbc1987e437f0d0f34f47c61f09a7c9d664ba42af976ecfb24555590bb22087 SHA512 b54372ff788aa42b2138c6de91c42c4f6a6440623de3679f08b0519c5c20d9d865c60fa63223c60f4374ff5badb800d6f209e75abb280b9815902757424faf0b
 DIST sqlite-doc-3380300.zip 10626490 BLAKE2B 7f1c2ff11ed4ba4748c35fcd72bedec5ce1ca68d87d00839f0a5f512c7309cf1c60678c0a0d8aecf07dc521c2240acdf1262f47ff3000b95e4953e095f2ec8f2 SHA512 4c30860b6ff0ba8c9455ea037cdda642bab2c1070e8726411ee51046b442f333623ce9c810d1d028a49ce571e6cc4afe363c643e90ba59463e84bb39298c4ad3
+DIST sqlite-doc-3380500.zip 10640188 BLAKE2B d831b672879a07e700c4d19bb97435cfc3aabc2371fd1b7f9e2257d1d53edaba72d974816d509fa60dbc7feaddf4b4f64c6bc061da4945aecab7be463951cb0c SHA512 1f8520e8b06cac97a3cd532d105be847b864d4d51ff2d8ab92c62b369e2e662aa477808e566e334a9103e31b84c119050b92ab6f0ef6d5d68db4d49bf2dd8182
 DIST sqlite-src-3380000.zip 13236840 BLAKE2B f303e39a9d913994f0756f986de9d316322b2278b8d2aeb505eb37d1c370c2edbb91f6f56e95b73938137a72b0c22a82fc8a2ceb19ab03271c38f653b66f66ea SHA512 9f4d3c406df5e6290f3f0b5e24b568723ab54bb085cb8cd7621ab42b0b8cd4f76e9784a4a29b42ea8cb0d1b7d759267c3cd980913d490d08e7172df05949131d
 DIST sqlite-src-3380100.zip 13241298 BLAKE2B 9dbccd5942f146da4c40d6208c491473c191752a74ee18ce131f3dea533976732440974e97906aead460daee39c7d6085ffa0f093d8f17e8f64c813bbb2409ad SHA512 df200916789c15e010a8e62dd8257833f34d4cf3496080a72fdc2330a530c193cda055e3c9ed39a404b87c8001c83a4b187491525ca95b5c5a1dbdd2f41cc222
 DIST sqlite-src-3380200.zip 13242285 BLAKE2B a07f895f57c355e2ec1c96fc857b63d774ff52f7e49c22b1c936b260e6e7787ec656059c02cc6d38845c4368507067d86dac493559541fbb914a3da9cbc67cce SHA512 fd457602db4577b31bc6053fd3cceb220337275e3fd26976f4270fb8a7da4fa047ca23dd18e2795cdfd894d05bad4c53954a81391d71507d359fb224995e420a
 DIST sqlite-src-3380300.zip 13244116 BLAKE2B d28c26a72729b49fac009e835068a15cb14b13bcef5e2d45a94929f22329002cbbf09ff9926a7cb041d1bcbd6fb9ebac784cce06196d29a9b9bf56f97645553e SHA512 d0605148931db62d167080e384d058e87452409fcb3ce366603e6eec8e2f68754259ce217c26e641401d5b0ae7714efd45fc4a881671db37597f2f027cd7da51
+DIST sqlite-src-3380500.zip 13245057 BLAKE2B d2deefbc918ab593146950c21047dbd94168d09150ffe00da20e4ee6b02f69516b496b14e1925b00ace8a4148b87bfb263a97d75ab48990e29e12796387fee5f SHA512 d91f060165354ff4b32a72627c16b6d2310d478768794a49eef57229d7199d83f951444fdc0725acf8d2565ef61a9c7921e9c965f429b018b6fd23d129b6e630
 EBUILD sqlite-3.38.0.ebuild 13054 BLAKE2B d9725fecd7429de654cf025ff7680b6d2763eff611bc5e89c004ad74d312fb00b5f6af1d8603f5d9d2610d5886856c5d1d42773f30f29f59531358569a5f2854 SHA512 f03e809d1899ff7a0ee74c226ebbdab9c074a232203cf965c726da5f832f59aa56c828cd3c7943b9c6fc11b28285a618b8c0555009bc7185433558c9f4a1d1ab
 EBUILD sqlite-3.38.1.ebuild 13056 BLAKE2B 9b19abc1a94304c6c45cac08507abc3aa91818db7e1ca369f32871bc8bb5eaceec114e19e85eb40825bee50932f3b35f26d986372f0b14f59f0fb5a87690419c SHA512 d78040c2ba1dea67907c44768e5109b0f141f50a43b6cc88421512bc175b307c6d3a360a84bdd4514645bbfeaef5707ae6fe94c9f40d9b910c6122720ad5b97a
 EBUILD sqlite-3.38.2.ebuild 13260 BLAKE2B 92c5bc279bd338b62cb19a9e1dacfe483c81a48c104e50f5fc1d8c413136031c9f20794f4eb5fcfecc2c3b1b926596788806934ab9eb57b03f635bdd3d81f835 SHA512 95af9af81ff7063c1d1b3497fb02525b36ff8495c08f933f5e226185d040efb3a6c87ba129fb3989ae96640bffc726fd40e8416379c8af3d8883ddfb3ea4005f
 EBUILD sqlite-3.38.3.ebuild 13260 BLAKE2B 92c5bc279bd338b62cb19a9e1dacfe483c81a48c104e50f5fc1d8c413136031c9f20794f4eb5fcfecc2c3b1b926596788806934ab9eb57b03f635bdd3d81f835 SHA512 95af9af81ff7063c1d1b3497fb02525b36ff8495c08f933f5e226185d040efb3a6c87ba129fb3989ae96640bffc726fd40e8416379c8af3d8883ddfb3ea4005f
+EBUILD sqlite-3.38.5.ebuild 13260 BLAKE2B 92c5bc279bd338b62cb19a9e1dacfe483c81a48c104e50f5fc1d8c413136031c9f20794f4eb5fcfecc2c3b1b926596788806934ab9eb57b03f635bdd3d81f835 SHA512 95af9af81ff7063c1d1b3497fb02525b36ff8495c08f933f5e226185d040efb3a6c87ba129fb3989ae96640bffc726fd40e8416379c8af3d8883ddfb3ea4005f
 MISC metadata.xml 771 BLAKE2B 34887e6d8a43fde66998787bfb3ca4bda644918a3a80afc650546547f132a9ff482a955ea5df8dded47a971a317be099bf5d9708a00ab25f00f78b714c3ed521 SHA512 e5955f59348abdee15c7fcaff38c220ab0ad84a717600525686e33a1fb7d29498c5b510d81c87ca49d48d7d11da782cf3840f38f1d4bd0e696fd7166aedeb597
diff --git a/dev-db/sqlite/sqlite-3.38.5.ebuild b/dev-db/sqlite/sqlite-3.38.5.ebuild
new file mode 100644
index 000000000000..c69a893b551d
--- /dev/null
+++ b/dev-db/sqlite/sqlite-3.38.5.ebuild
@@ -0,0 +1,436 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+if [[ "${PV}" != "9999" ]]; then
+	SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))"
+	DOC_PV="${SRC_PV}"
+	# DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))"
+fi
+
+DESCRIPTION="SQL database engine"
+HOMEPAGE="https://sqlite.org/"
+
+# On version updates, make sure to read the forum (https://sqlite.org/forum/forum)
+# for hints regarding test failures, backports, etc.
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://sqlite.org/2022/${PN}-src-${SRC_PV}.zip
+		doc? ( https://sqlite.org/2022/${PN}-doc-${DOC_PV}.zip )"
+fi
+
+LICENSE="public-domain"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
+if [[ "${PV}" == "9999" ]]; then
+	PROPERTIES="live"
+fi
+RESTRICT="!test? ( test )"
+
+if [[ "${PV}" == "9999" ]]; then
+	BDEPEND=">=dev-lang/tcl-8.6:0
+		dev-vcs/fossil"
+else
+	BDEPEND="app-arch/unzip
+		>=dev-lang/tcl-8.6:0"
+fi
+RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+	icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
+	tools? ( dev-lang/tcl:0= )"
+DEPEND="${RDEPEND}
+	test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )"
+
+if [[ "${PV}" == "9999" ]]; then
+	S="${WORKDIR}/${PN}"
+else
+	S="${WORKDIR}/${PN}-src-${SRC_PV}"
+fi
+
+_fossil_fetch() {
+	local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
+	local repo_id="${1}"
+	local repo_uri="${2}"
+
+	local -x FOSSIL_HOME="${HOME}"
+
+	mkdir -p "${T}/fossil/${repo_id}" || die
+	pushd "${T}/fossil/${repo_id}" > /dev/null || die
+
+	if [[ -n "${EVCS_OFFLINE}" ]]; then
+		if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
+			die "Network activity disabled using EVCS_OFFLINE and clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
+		fi
+	else
+		if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
+			einfo fossil clone --verbose "${repo_uri}" "${repo_id}.fossil"
+			fossil clone --verbose "${repo_uri}" "${repo_id}.fossil" || die
+			echo
+		else
+			cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" . || die
+			einfo fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}"
+			fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}" || die
+			echo
+		fi
+
+		(
+			addwrite "${distdir}"
+			mkdir -p "${distdir}/fossil-src/${repo_id}" || die
+			cp -p "${repo_id}.fossil" "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" || die
+		)
+	fi
+
+	popd > /dev/null || die
+}
+
+_fossil_checkout() {
+	local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
+	local repo_id="${1}"
+	local branch_or_commit="${2}"
+	local target_directory="${3}"
+
+	local -x FOSSIL_HOME="${HOME}"
+
+	if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
+		die "Clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
+	fi
+
+	if [[ ! -f "${T}/fossil/${repo_id}/${repo_id}.fossil" ]]; then
+		mkdir -p "${T}/fossil/${repo_id}" || die
+		cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" "${T}/fossil/${repo_id}" || die
+	fi
+
+	mkdir "${target_directory}" || die
+	pushd "${target_directory}" > /dev/null || die
+
+	einfo fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}"
+	fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}" || die
+	echo
+
+	popd > /dev/null || die
+}
+
+fossil_fetch() {
+	local repo_id="${1}"
+	local repo_uri="${2}"
+	local target_directory="${3}"
+
+	local branch_or_commit="${EFOSSIL_COMMIT:-${EFOSSIL_BRANCH:-trunk}}"
+
+	_fossil_fetch "${repo_id}" "${repo_uri}"
+	_fossil_checkout "${repo_id}" "${branch_or_commit}" "${target_directory}"
+}
+
+src_unpack() {
+	if [[ "${PV}" == "9999" ]]; then
+		fossil_fetch sqlite https://sqlite.org/src "${WORKDIR}/${PN}"
+		if use doc; then
+			fossil_fetch sqlite-doc https://sqlite.org/docsrc "${WORKDIR}/${PN}-doc"
+		fi
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	eapply_user
+
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local -x CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}"
+	local options=()
+
+	options+=(
+		--enable-load-extension
+		--enable-threadsafe
+	)
+
+	# Support detection of misuse of SQLite API.
+	# https://sqlite.org/compile.html#enable_api_armor
+	append-cppflags -DSQLITE_ENABLE_API_ARMOR
+
+	# Support bytecode and tables_used virtual tables.
+	# https://sqlite.org/compile.html#enable_bytecode_vtab
+	# https://sqlite.org/bytecodevtab.html
+	append-cppflags -DSQLITE_ENABLE_BYTECODE_VTAB
+
+	# Support column metadata functions.
+	# https://sqlite.org/compile.html#enable_column_metadata
+	# https://sqlite.org/c3ref/column_database_name.html
+	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
+
+	# Support sqlite_dbpage virtual table.
+	# https://sqlite.org/compile.html#enable_dbpage_vtab
+	# https://sqlite.org/dbpage.html
+	append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB
+
+	# Support dbstat virtual table.
+	# https://sqlite.org/compile.html#enable_dbstat_vtab
+	# https://sqlite.org/dbstat.html
+	append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
+
+	# Support sqlite3_serialize() and sqlite3_deserialize() functions.
+	# https://sqlite.org/compile.html#enable_deserialize
+	# https://sqlite.org/c3ref/serialize.html
+	# https://sqlite.org/c3ref/deserialize.html
+	append-cppflags -DSQLITE_ENABLE_DESERIALIZE
+
+	# Support comments in output of EXPLAIN.
+	# https://sqlite.org/compile.html#enable_explain_comments
+	append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+
+	# Support Full-Text Search versions 3, 4 and 5.
+	# https://sqlite.org/compile.html#enable_fts3
+	# https://sqlite.org/compile.html#enable_fts3_parenthesis
+	# https://sqlite.org/compile.html#enable_fts4
+	# https://sqlite.org/compile.html#enable_fts5
+	# https://sqlite.org/fts3.html
+	# https://sqlite.org/fts5.html
+	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
+	options+=(--enable-fts5)
+
+	# Support hidden columns.
+	append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
+
+	# Support memsys5 memory allocator.
+	# https://sqlite.org/compile.html#enable_memsys5
+	# https://sqlite.org/malloc.html#memsys5
+	append-cppflags -DSQLITE_ENABLE_MEMSYS5
+
+	# Support sqlite3_normalized_sql() function.
+	# https://sqlite.org/c3ref/expanded_sql.html
+	append-cppflags -DSQLITE_ENABLE_NORMALIZE
+
+	# Support sqlite_offset() function.
+	# https://sqlite.org/compile.html#enable_offset_sql_func
+	# https://sqlite.org/lang_corefunc.html#sqlite_offset
+	append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC
+
+	# Support pre-update hook functions.
+	# https://sqlite.org/compile.html#enable_preupdate_hook
+	# https://sqlite.org/c3ref/preupdate_count.html
+	append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK
+
+	# Support Resumable Bulk Update extension.
+	# https://sqlite.org/compile.html#enable_rbu
+	# https://sqlite.org/rbu.html
+	append-cppflags -DSQLITE_ENABLE_RBU
+
+	# Support R*Trees.
+	# https://sqlite.org/compile.html#enable_rtree
+	# https://sqlite.org/compile.html#enable_geopoly
+	# https://sqlite.org/rtree.html
+	# https://sqlite.org/geopoly.html
+	append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY
+
+	# Support Session extension.
+	# https://sqlite.org/compile.html#enable_session
+	# https://sqlite.org/sessionintro.html
+	append-cppflags -DSQLITE_ENABLE_SESSION
+
+	# Support scan status functions.
+	# https://sqlite.org/compile.html#enable_stmt_scanstatus
+	# https://sqlite.org/c3ref/stmt_scanstatus.html
+	# https://sqlite.org/c3ref/stmt_scanstatus_reset.html
+	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
+
+	# Support sqlite_stmt virtual table.
+	# https://sqlite.org/compile.html#enable_stmtvtab
+	# https://sqlite.org/stmt.html
+	append-cppflags -DSQLITE_ENABLE_STMTVTAB
+
+	# Support unknown() function.
+	# https://sqlite.org/compile.html#enable_unknown_sql_function
+	append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
+
+	# Support unlock notification.
+	# https://sqlite.org/compile.html#enable_unlock_notify
+	# https://sqlite.org/c3ref/unlock_notify.html
+	# https://sqlite.org/unlock_notify.html
+	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
+
+	# Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements.
+	# https://sqlite.org/compile.html#enable_update_delete_limit
+	# https://sqlite.org/lang_delete.html#optional_limit_and_order_by_clauses
+	# https://sqlite.org/lang_update.html#optional_limit_and_order_by_clauses
+	append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
+
+	# Support soundex() function.
+	# https://sqlite.org/compile.html#soundex
+	# https://sqlite.org/lang_corefunc.html#soundex
+	append-cppflags -DSQLITE_SOUNDEX
+
+	# Support URI filenames.
+	# https://sqlite.org/compile.html#use_uri
+	# https://sqlite.org/uri.html
+	append-cppflags -DSQLITE_USE_URI
+
+	# debug USE flag.
+	options+=($(use_enable debug))
+
+	# icu USE flag.
+	if use icu; then
+		# Support ICU extension.
+		# https://sqlite.org/compile.html#enable_icu
+		append-cppflags -DSQLITE_ENABLE_ICU
+		sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+	fi
+
+	# readline USE flag.
+	options+=(
+		--disable-editline
+		$(use_enable readline)
+	)
+	if use readline; then
+		options+=(--with-readline-inc="-I${ESYSROOT}/usr/include/readline")
+	fi
+
+	# secure-delete USE flag.
+	if use secure-delete; then
+		# Enable secure_delete pragma by default.
+		# https://sqlite.org/compile.html#secure_delete
+		# https://sqlite.org/pragma.html#pragma_secure_delete
+		append-cppflags -DSQLITE_SECURE_DELETE
+	fi
+
+	# static-libs USE flag.
+	options+=($(use_enable static-libs static))
+
+	# tcl, test, tools USE flags.
+	if use tcl || use test || { use tools && multilib_is_native_abi; }; then
+		options+=(
+			--enable-tcl
+			--with-tcl="${ESYSROOT}/usr/$(get_libdir)"
+		)
+	else
+		options+=(--disable-tcl)
+	fi
+
+	if [[ "${ABI}" == "x86" ]]; then
+		if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
+			append-cflags -mfpmath=sse
+		else
+			append-cflags -ffloat-store
+		fi
+
+		# Skip known-broken test for now
+		# https://sqlite.org/forum/forumpost/d97caf168f
+		# https://sqlite.org/forum/forumpost/50f136d91d
+		if use test ; then
+			rm test/atof1.test || die
+		fi
+	fi
+
+	econf "${options[@]}"
+}
+
+multilib_src_compile() {
+	emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
+
+	if use tools && multilib_is_native_abi; then
+		emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh
+	fi
+
+	if [[ "${PV}" == "9999" ]] && use doc && multilib_is_native_abi; then
+		emake tclsqlite3.c
+
+		local build_directory="$(pwd)"
+		build_directory="${build_directory##*/}"
+
+		mkdir "${WORKDIR}/${PN}-doc-build" || die
+		pushd "${WORKDIR}/${PN}-doc-build" > /dev/null || die
+
+		emake -f "../${PN}-doc/Makefile" -j1 SRC="../${PN}" BLD="../${build_directory}" DOC="../${PN}-doc" CC="$(tc-getBUILD_CC)" TCLINC="" TCLFLAGS="$($(tc-getBUILD_PKG_CONFIG) --libs tcl) -ldl -lm" base doc
+		rmdir doc/matrix{/*,} || die
+
+		popd > /dev/null || die
+	fi
+}
+
+multilib_src_test() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		ewarn "Skipping tests due to root permissions"
+		return
+	fi
+
+	local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}"
+
+	# e_uri.test tries to open files in /.
+	# https://bugs.gentoo.org/839798
+	local SANDBOX_PREDICT=${SANDBOX_PREDICT}
+	addpredict "/test.db:/ÿ.db"
+
+	emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
+
+	if use tools && multilib_is_native_abi; then
+		install_tool() {
+			if [[ -f ".libs/${1}" ]]; then
+				newbin ".libs/${1}" "${2}"
+			else
+				newbin "${1}" "${2}"
+			fi
+		}
+
+		install_tool changeset sqlite3-changeset
+		install_tool dbdump sqlite3-db-dump
+		install_tool dbhash sqlite3-db-hash
+		install_tool dbtotxt sqlite3-db-to-txt
+		install_tool index_usage sqlite3-index-usage
+		install_tool rbu sqlite3-rbu
+		install_tool scrub sqlite3-scrub
+		install_tool showdb sqlite3-show-db
+		install_tool showjournal sqlite3-show-journal
+		install_tool showshm sqlite3-show-shm
+		install_tool showstat4 sqlite3-show-stat4
+		install_tool showwal sqlite3-show-wal
+		install_tool sqldiff sqlite3-diff
+		install_tool sqlite3_analyzer sqlite3-analyzer
+		install_tool sqlite3_checker sqlite3-checker
+		install_tool sqlite3_expert sqlite3-expert
+		install_tool sqltclsh sqlite3-tclsh
+
+		unset -f install_tool
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+
+	doman sqlite3.1
+
+	if use doc; then
+		if [[ "${PV}" == "9999" ]]; then
+			pushd "${WORKDIR}/${PN}-doc-build/doc" > /dev/null || die
+		else
+			pushd "${WORKDIR}/${PN}-doc-${DOC_PV}" > /dev/null || die
+		fi
+
+		find "(" -name "*.db" -o -name "*.txt" ")" -delete || die
+		if [[ "${PV}" != "9999" ]]; then
+			rm search search.d/admin || die
+			rmdir search.d || die
+			find -name "*~" -delete || die
+		fi
+
+		(
+			docinto html
+			dodoc -r *
+		)
+
+		popd > /dev/null || die
+	fi
+}
diff --git a/dev-dotnet/Manifest.gz b/dev-dotnet/Manifest.gz
index 8f6b1e8fe4c4..ef8b4eb20aec 100644
Binary files a/dev-dotnet/Manifest.gz and b/dev-dotnet/Manifest.gz differ
diff --git a/dev-dotnet/dotnet-sdk-bin/Manifest b/dev-dotnet/dotnet-sdk-bin/Manifest
index 0bbf7cb9b83e..c00829160294 100644
--- a/dev-dotnet/dotnet-sdk-bin/Manifest
+++ b/dev-dotnet/dotnet-sdk-bin/Manifest
@@ -1,37 +1,13 @@
-DIST dotnet-sdk-3.1.416-linux-arm.tar.gz 126456099 BLAKE2B 2181b3eaa3eb35bfb98015d2c668363acc0071883ecf8367d62b7d4d7d2b94b10401c7e7a93fbb02e323ee6dd27311b6574854bbc4061e2e8d5acbc102a7cb40 SHA512 33a6d64f466839cc30adef87909a2ff98ecdf6bb763b82a7951314ee8eded7dc210297f914d4aa0b9c0b101aa0c33da97cb15ff64c5f83f08b212b885d662e90
-DIST dotnet-sdk-3.1.416-linux-arm64.tar.gz 121467597 BLAKE2B e8148fe25069551dd9df996ca6ca6b754190c805a43e24b4f0b65227eaf70064091d222b6471f16b3eac240425c963c2f23d0673635a6c3fd4f486df73c14672 SHA512 0065c7afb129b1a0e0c11703309f3b45cf9a3c0ea156247f7cc61555f21c37054f215eb77add509dad77b1d388a4e6c585f8a8016109f31c5b64184b25e2c407
-DIST dotnet-sdk-3.1.416-linux-x64.tar.gz 121484416 BLAKE2B 3ffdba4b7a5f7c87ef288d64c891f257b09de9a7ad8d6032d831ac6c57da279b177ba446b1d2eca392c231e10d1ea596914409c5cf8f2584a34a4e0fc555ce42 SHA512 dec1dcf326487031c45dec0849a046a0d034d6cbb43ab591da6d94c2faf72da8e31deeaf4d2165049181546d5296bb874a039ccc2f618cf95e68a26399da5e7f
-DIST dotnet-sdk-3.1.417-linux-arm.tar.gz 126583706 BLAKE2B a9cc9ffe4ee35fdad17c50b9df5508942e36f27bd8514d16eff3eea42ab8173416cc8706a0d6179bcdf2f632cd18a672a3dbcbb71dc2cf794ca4c4b2b609e24d SHA512 d68f9b130f4a516cb199c9010a42acdda0c9e8c705bce0e72e9854587ee54f5a017b1cea5b84f15dae057531a8a619cffffa1e79f3413d376ba7d7226407574c
-DIST dotnet-sdk-3.1.417-linux-arm64.tar.gz 121558839 BLAKE2B c8913563693949b0dbf1f47681367e87b6a4fb2e3a97e4c391008fec7f929bd03011685cc65bc0938e1fe50b6ab11c8827b80ac0dc2e65a472d71ae17e2b4996 SHA512 28ea17c3c8e57721fdafcdf8339a175d4d7c29616597d7dac60362fe4ac8c3a8493612865a37e985729b3d3953caae7fed2f8a11a0d0bb1dd24b1d816d6b6abf
-DIST dotnet-sdk-3.1.417-linux-x64.tar.gz 121389919 BLAKE2B ac7532e2a3e0084a2f600c4a4365fa34adeb031a24c8043761b7b0fcfa41dc875bebbf7f2b5a9d450a1332443f8a9edc0ab33fee3536b5cd0d18ee9b5f7e4c63 SHA512 8eb1002ad829ddd17638b942d3f8da24ad71ccab268a92a1fa6af6a65d86a4ab7f885f663ea9c68127bb356462bce125222ec4f04dc928005cbbbb1a8658f107
-DIST dotnet-sdk-5.0.301-linux-arm.tar.gz 138735656 BLAKE2B c23732749f67bd2ca63cadba9bcb3f5abd4e10d00fed441825e6a59f9d3a3e663101502e5557dd94e737443cc9bbab0d5dbe8f7ebdbde54586596ec5c520a64f SHA512 89663ffb22299ad626d3f1d5129e493fb8784e6ed854b128a364407a060eec2979cd7d3c9e4f3df8e47ccb72b98ff8b18e8d53c7fb65b3455faa7344f67417a2
-DIST dotnet-sdk-5.0.301-linux-arm64.tar.gz 136933875 BLAKE2B 6c48c8a2d47ba5bed47e6176d10e273ec996686cb5a4d5b3239098ff23d44526091f7eae1ce762a2eb2f6f31420cafda84471b936082469eadc8c62aa0dcd8bf SHA512 56e233b8f35abe80984bc8a60028f4f8dbc8543313a0711045ef13c693e11e706ee4809574518f57910ec2c93bed896da32760c8143a298556dc25478caca90f
-DIST dotnet-sdk-5.0.301-linux-x64.tar.gz 142255332 BLAKE2B 172888e2eb78d2f768cff6a7e99d6473b469b7cbde74a4eab63e601d85bad118be374f330a413a9b6b3e6773340bdaef8ead4ed54a194189a50cac6b61fac556 SHA512 81cd7a3550a262d5c907030677429fa9a1cb515071274931ab760bd8bb2a14f40c9384c8757e1c1aa681b1de22035f16bf20b41ed208becd054cc9bb1f620322
-DIST dotnet-sdk-5.0.405-linux-arm.tar.gz 138868868 BLAKE2B 84c68f8e60361479da77bf9ec28afe171d024f85da5544cf205ec49366cb0b9a360f5efb95908a1d3371b0032d08db2de018734ffdbc70c47a8a280d849455fc SHA512 a84eaa3ae75377bf9c6853c58187888324ca412a51bf7f3f96b1fdefb4dbbc02d4d0e71e5e6cbd07b4124684cda054ec14910cbc220d1120845ec6219d7e0636
-DIST dotnet-sdk-5.0.405-linux-arm64.tar.gz 137068545 BLAKE2B 99c2ad93e2e8921f12979f8385b21624bfc5f24302bc7be3421328f6da5d99edca965cde290ef29a3eac6a506d765190f64a1f75eb8262948dd358eccfb90177 SHA512 f53ee4bc1b5f79300072f4e8f71eccad5f9bd72cef7c792540309f98dd4fc175647422d16f2f48d0645474aae4a10e33646f0d4b74461656a49d34d765e71451
-DIST dotnet-sdk-5.0.405-linux-x64.tar.gz 142442372 BLAKE2B 664549356de17535a86805c6db013585b3be8e99703fc071aef7fcb2a467dfd71e04c6c8c3cca20c521a57057dbc1a7390357bbcdaaddfac3fc6e9705c213c99 SHA512 be1b3b2c213937d5d17ed18c6bd3f8fab2d66593642caf14229d12f68ddfa304edb4d88ce735ee0347969dc79a9e3d7d8cddfb5ff2044177cda0f2072ed8bd47
-DIST dotnet-sdk-5.0.406-linux-arm.tar.gz 139402651 BLAKE2B 6e76ed2d398a18abe836be27ac2c022ca83074fbbfad0cddec0ff0601e9d9bfa18b9b813049db010bab07bad175808640212099a4d18b77b820b5bdc40276dcb SHA512 7ac3e2532de5a6b41f379fee445d85040bd033799d525d021b8d582e97c22cc24b3ddfac90e222944a36e6f01538b9906b58cb0bd3c09a8cc56fb82fed8f6a79
-DIST dotnet-sdk-5.0.406-linux-arm64.tar.gz 137361876 BLAKE2B 86810b37fd3aeffabe2092169de59e931eeed01e0b98e3ff444e8e41ff2906c3e64b1408af75b460919d906612c0c527445b86d243ca89daaa25173c373ecfd4 SHA512 df52611b3135650322030d18c685fa6d0fc0adabae976ea9509ab3e4daa306098b3e4dca31f1950c573dbadf7cfcffacc6ad609c893ec31bbb4df897548651cf
-DIST dotnet-sdk-5.0.406-linux-x64.tar.gz 142949090 BLAKE2B e9ca7bb837de6754831dfaf1b824c1ff61b21a90fa2cc4c5451d30d8e50cdcd5bc7af0eaf6b5d3062e7f43ecca1b518db8014db00fc43ed0976ea466d4dcea39 SHA512 21f0617d359d5c333a8925af71b359c0e9e371eaa6e4b20faf0f699296cebaacc56cb9660fa310b2ed99ca636f241f2df999698a883cf7899dd670bdf92bdd29
-DIST dotnet-sdk-6.0.100-linux-arm.tar.gz 170285721 BLAKE2B b15484a3dd3472cd1b26b88b766b9bcc23bb9191cecde3052c619ef70337fae533b87610fb124d898d9c91645a76183ae27c4e073dcb3d9f599c2708305b3b5e SHA512 c1e555893c48c4f4256d3e6b1d36b31d8a4d7763a6e958fb63dd31436c660648d481612b5e25d79a613e84a1954f5eac2c9c2b740bf410958172780f7bbeaeb3
-DIST dotnet-sdk-6.0.100-linux-arm64.tar.gz 168213476 BLAKE2B ae16caed1a9b7b50f1141dafd8b47001d7e8d1d166809c7db143d3386d420b43728c01e010cf14757290032dc7779997d28a5ed168ffe40e9ea7f2aed53cc9d1 SHA512 e5983c1c599d6dc7c3c7496b9698e47c68247f04a5d0d1e3162969d071471297bce1c2fd3a1f9fb88645006c327ae79f880dcbdd8eefc9166fd717331f2716e7
-DIST dotnet-sdk-6.0.100-linux-x64.tar.gz 173759744 BLAKE2B fea1754290fbdbeb1e46a1e1e1f0b210010a5bee648d5a1e4a39cbe3d95d9903ba1f992ee5e3a9e410b622f9c058e316f16567f2df524dfbe8d230b383567b64 SHA512 cb0d174a79d6294c302261b645dba6a479da8f7cf6c1fe15ae6998bc09c5e0baec810822f9e0104e84b0efd51fdc0333306cb2a0a6fcdbaf515a8ad8cf1af25b
-DIST dotnet-sdk-6.0.101-linux-arm.tar.gz 169694030 BLAKE2B 71b13ebe3e7a108a808011c0ac9cae55cdc9c321a6884a194e26aa564dc421d7c2ee671f7fce1c18a6e06eea16837d54db0bdf9c93334a73245f8e8be412bbcd SHA512 f9e212dc4cccbe665d9aac23da6bdddce4957ae4e4d407cf3f1d6da7e79784ebd408c3a59b3ecc6ceaa930b37cf01a4a91c6b38517970d49227e96e50658cc46
-DIST dotnet-sdk-6.0.101-linux-arm64.tar.gz 167474911 BLAKE2B fed8915bd9564c271265b3f517ece94f3e5929fc8700d0a043e2dc1ccd8aa5fa3377371bf65d490c6c061be5409f61b66b91b4377f154450fd305fdb0d2f61ff SHA512 04cd89279f412ae6b11170d1724c6ac42bb5d4fae8352020a1f28511086dd6d6af2106dd48ebe3b39d312a21ee8925115de51979687a9161819a3a29e270a954
-DIST dotnet-sdk-6.0.101-linux-x64.tar.gz 173671008 BLAKE2B 340ddcfae67f2bbe4dd915c53977bb9b7b32c86837412a4fcb7edc78bb19584df94a893ae894141654547f4969486114addb0074383a5f09ff89c4534554c854 SHA512 ca21345400bcaceadad6327345f5364e858059cfcbc1759f05d7df7701fec26f1ead297b6928afa01e46db6f84e50770c673146a10b9ff71e4c7f7bc76fbf709
-DIST dotnet-sdk-6.0.102-linux-arm.tar.gz 169190305 BLAKE2B 4f3aa3e2de89f8c360505c4287207bc285090f79e808e8b7637a3e92bbaaf69a6ea12c7296dfb729cb56a6c6e226ee276ff5e8776b439c140aeab5bcedd05824 SHA512 a72a0e81c62478b0dc662ef0aaeb7f96e7dd534e90b3ac1bdab1ca98dd93a4605881dba6e9ed2315781fdf71f5b33acb1aa5e28090c7a1693405bebed5853094
-DIST dotnet-sdk-6.0.102-linux-arm64.tar.gz 167109725 BLAKE2B e687b702ce7e2ad5f8abf87eb63716c2e29880b9fa8c10f37ede05f2d59f2426433549a8d535b71f7243f698a014871b6f2de8a2c2b06600bbe8a74fbdb4a8c5 SHA512 790cbf322ca8fed32eaf574f19d0bdc05656c5a88a65aa4dba8269cfce1443cd7cdeecdd3a40e353c368f055490b70592ca7f15f981a66c5b3a9517d0b09e4cb
-DIST dotnet-sdk-6.0.102-linux-x64.tar.gz 173139326 BLAKE2B cac49a69635c4f90bafc8e04b42c36e3196f6af8c39da152f16d771a3eff56fa39271c4af441a687cd9189031f6c68de3063a17aa1d21bc303a8172980c802de SHA512 edd79ebad3327032ea0aaa8504c14e3270050bb459b098202676776b41a3a1d282aaefd1e5e8aa09ef7f7cf7c4601c4783a57112ff6e3d427507e8eec2bfb748
-DIST dotnet-sdk-6.0.201-linux-arm.tar.gz 172378853 BLAKE2B 46424de89db998dd64696e8c9bc9d421280a1f87e4af100702cdab8a5995f26c6bbe26b4e5e10fdd04b357ad2ac70cdf8e00eaa60ac89c20b75aa4b621492a64 SHA512 5a683430325a90dd1d8e0071a1868939fb01268f9eb389ca1dc40956fde6b9f45bec086553ad3333139e530dfe5afae48195bcdfec388b0b568989924a1f1dd7
-DIST dotnet-sdk-6.0.201-linux-arm64.tar.gz 170314335 BLAKE2B 609c2487288982e191f7b2bb795219d44d789311873278a6d75fb72936211530ee21330942b8bf3ab239f752d62f36073da518cbf59f9c4a0dc48fc3f3911a17 SHA512 2ea443c27ab7ca9d566e4df0e842063642394fd22fe2a8620371171c8207ae6a4a72c8c54fc6af5b6b053be25cf9c09a74504f08b963e5bd84544619aed9afc2
-DIST dotnet-sdk-6.0.201-linux-x64.tar.gz 176562201 BLAKE2B 842b0483689a2efc66825ae8bc0b074532c26072869d25ceac6e9fd0fcd2814361a840920483c4199e8a30040048e953b31a3c215047d8f0ba77d45760d605f4 SHA512 a4d96b6ca2abb7d71cc2c64282f9bd07cedc52c03d8d6668346ae0cd33a9a670d7185ab0037c8f0ecd6c212141038ed9ea9b19a188d1df2aae10b2683ce818ce
-EBUILD dotnet-sdk-bin-3.1.416.ebuild 1348 BLAKE2B 9c9bf8fef6b6285ac1f7596d367175a3023650153c76e6f4417967e268f0e677c3d8ef1e1a1357b58bbe0e13f370bb7aa2ff09fe0ebd030298bbd875cec373ab SHA512 374337f02b11257b9676daef283ebc7a7a7d274b959cf46cfec1597489aa9df6dde588a1fc12e0552a3de99eb101e4902ab7cbd8cf7192d367610fe972dd8874
-EBUILD dotnet-sdk-bin-3.1.417.ebuild 1348 BLAKE2B 9c9bf8fef6b6285ac1f7596d367175a3023650153c76e6f4417967e268f0e677c3d8ef1e1a1357b58bbe0e13f370bb7aa2ff09fe0ebd030298bbd875cec373ab SHA512 374337f02b11257b9676daef283ebc7a7a7d274b959cf46cfec1597489aa9df6dde588a1fc12e0552a3de99eb101e4902ab7cbd8cf7192d367610fe972dd8874
-EBUILD dotnet-sdk-bin-5.0.301.ebuild 1403 BLAKE2B 9c0675c93f53e9a3917c54814735ae7c101a6de2b4a803ff96068fbc3fa7e584fd11a7843c1eb556a15668d66f9550a5ddb83e4ddeaddbb7ad6a848f7a758e66 SHA512 5f1ccdf3283b900af7258bbf6abf3f2d38a693a657c911604dfc3242a887564e3d59f3305c57b2eadbf435e9c0a12fadbfcae71d10fe331dddddd2d6f80fc22b
-EBUILD dotnet-sdk-bin-5.0.405.ebuild 1403 BLAKE2B 9c0675c93f53e9a3917c54814735ae7c101a6de2b4a803ff96068fbc3fa7e584fd11a7843c1eb556a15668d66f9550a5ddb83e4ddeaddbb7ad6a848f7a758e66 SHA512 5f1ccdf3283b900af7258bbf6abf3f2d38a693a657c911604dfc3242a887564e3d59f3305c57b2eadbf435e9c0a12fadbfcae71d10fe331dddddd2d6f80fc22b
-EBUILD dotnet-sdk-bin-5.0.406.ebuild 1403 BLAKE2B 9c0675c93f53e9a3917c54814735ae7c101a6de2b4a803ff96068fbc3fa7e584fd11a7843c1eb556a15668d66f9550a5ddb83e4ddeaddbb7ad6a848f7a758e66 SHA512 5f1ccdf3283b900af7258bbf6abf3f2d38a693a657c911604dfc3242a887564e3d59f3305c57b2eadbf435e9c0a12fadbfcae71d10fe331dddddd2d6f80fc22b
-EBUILD dotnet-sdk-bin-6.0.100.ebuild 1842 BLAKE2B 45b4ed092c3f7b1e1b7c2cafa65715c1af17a484a8e62e030aed6c577eaf23ad1f1ab10a224d3b07d744cc708f1e7f5e2260f58d2cd9c3fbc7f03d0707307f87 SHA512 51db7fab6ff2033981f8613a47d46ac56bc30963fdb8a18593835f193529ebc2255fd341c4584aa8e270d99188d311e6ed1134c02ad699b4036e3fd9ab1ebe8f
-EBUILD dotnet-sdk-bin-6.0.101.ebuild 1842 BLAKE2B 45b4ed092c3f7b1e1b7c2cafa65715c1af17a484a8e62e030aed6c577eaf23ad1f1ab10a224d3b07d744cc708f1e7f5e2260f58d2cd9c3fbc7f03d0707307f87 SHA512 51db7fab6ff2033981f8613a47d46ac56bc30963fdb8a18593835f193529ebc2255fd341c4584aa8e270d99188d311e6ed1134c02ad699b4036e3fd9ab1ebe8f
-EBUILD dotnet-sdk-bin-6.0.102.ebuild 1842 BLAKE2B 45b4ed092c3f7b1e1b7c2cafa65715c1af17a484a8e62e030aed6c577eaf23ad1f1ab10a224d3b07d744cc708f1e7f5e2260f58d2cd9c3fbc7f03d0707307f87 SHA512 51db7fab6ff2033981f8613a47d46ac56bc30963fdb8a18593835f193529ebc2255fd341c4584aa8e270d99188d311e6ed1134c02ad699b4036e3fd9ab1ebe8f
-EBUILD dotnet-sdk-bin-6.0.201.ebuild 1842 BLAKE2B 45b4ed092c3f7b1e1b7c2cafa65715c1af17a484a8e62e030aed6c577eaf23ad1f1ab10a224d3b07d744cc708f1e7f5e2260f58d2cd9c3fbc7f03d0707307f87 SHA512 51db7fab6ff2033981f8613a47d46ac56bc30963fdb8a18593835f193529ebc2255fd341c4584aa8e270d99188d311e6ed1134c02ad699b4036e3fd9ab1ebe8f
-MISC metadata.xml 409 BLAKE2B 9ca816be38e5b6ac61e3f2878f767404078167aa8e7e25286427319878b499e6430204141579b409253f17c7438933edab377fff5747859c08cf8bc7ac937f17 SHA512 2124293e53d388f13be1789e342c9743b5a17ed96fa9a7364ac207fc391e52e8ff26b2dea9f39eb9fa43a89fc6ff14004c4443fa56a1c57af5451d98dabd148c
+DIST dotnet-sdk-3.1.418-linux-arm.tar.gz 126586836 BLAKE2B ea481c1653d11a2c49d7b21b5ab26978d4155c43f9426110d02fa61a4bd895defade30a7ff4a1ba70e0331eb16b404a8cd099f09923d5043f339c7fae2be6eaf SHA512 a5edf84b01740767cd0ed2d7e8f84ed66bd786fc61bc93065d3125c8eac123e6c383e7155e5ead31e344b691e23788b240f812d5a5759fa0d764c0e336f2cc22
+DIST dotnet-sdk-3.1.418-linux-arm64.tar.gz 121573287 BLAKE2B 5858d904559127e4db7a70b0f7c3b7be30ba154745a71dc34b758159dad8422b20138717d958eb4246c5e776dd433c21aa435d56f2ac3760c634fdc22d972e26 SHA512 8c3f1254a27991f116f499b11aa389266bc63b93a85ab7103b398bdf14225755277499ccb8297012f572732e5e521c23d02fe3d99b552ecadf8af2867456ebc5
+DIST dotnet-sdk-3.1.418-linux-x64.tar.gz 121660196 BLAKE2B ab129d19bec0717c021e3de6f71b10c5e87e266005ddb5c5879f1615638cd5a3561f6b0b1af2ac035b6b16317f5a51e303203a4579bb0cd3d0299a8bbde78555 SHA512 e60f14841f1d0156de163f6f1e4c6358f14bd57e81beed13d294022da8a5182e41b8333591f92c4cac8eec138b7bc85725c19ae10e4e73a139a5231bb12b557f
+DIST dotnet-sdk-5.0.407-linux-arm.tar.gz 139346500 BLAKE2B 5bd4cdda68fd5668be488d2f75bf8ba79474985f8c1142af8c5209b0fc68ff39a4ab9a1916671ebaf6f783f0d9d193a454861474240642d77eb96e8102d7b535 SHA512 37db60df90f9f43a5399c1b7929c545e3815d7a91fdea82c96a136dcef993b0f8c67568759ae24321dee818fd1501cea8e541a159e10ed1a08fa96dddf2ffb9e
+DIST dotnet-sdk-5.0.407-linux-arm64.tar.gz 137430261 BLAKE2B 810f545a399d9f59dece514f9024730281d8cdda7f7d4e632e5b53490dfbf7e60595a720cba390608ad3b01ba6337706f7bf03570fa95e80469e8a9bcd6fb21f SHA512 500428a6a99d3825400be5cc1a723283f21a98c15ef68914e9252fc872b625fd10c220afd9787b7db6b226a04e83d30658234d464ccdf838639920d1768025e0
+DIST dotnet-sdk-5.0.407-linux-x64.tar.gz 142941732 BLAKE2B 6c049812539aec3ee48c653f9344a9b8aac356d862aa864da97692be37455c8390956c4fb4b93f432b518556c575ac25bef29ff31013b0ec391b8de80c8a59fa SHA512 b45f1bf086bfb5e0701c5e14534524ffc87d0195358ac4fa2cf36dac74537ca4c21c7177cfbfa7e121e77aa4106bb1e7039c9739ad73b942e2437bc5e39e6dce
+DIST dotnet-sdk-6.0.202-linux-arm.tar.gz 172857108 BLAKE2B b5bcd76479e4c1204c1de1bded5b97a5540a27d8d456a53538aa96ead10bc2a014f7de2e8ed76fce45bf221c3a6455d0cf79335dec64d5c4ea1867585972e587 SHA512 8c2d56256f4bebe58caee7810b7689408ff023b1f2e68f99fa375f0115db41ef0c3eb160b9ab84dc2764443a045801a4b03f6bc9090e0c1583fca2587ea0d9d6
+DIST dotnet-sdk-6.0.202-linux-arm64.tar.gz 170726144 BLAKE2B 08dd20c5fabfddeda1748b12e0917398bbe1e04ea28cfeb207a732dd6eb98ce46d678c9fe18078f40b7e1f30820ed6774eb10b38469424dc00fb19f44d1fceb3 SHA512 2d0021bb4cd221ffba6888dbd6300e459f45f4f9d3cf7323f3b97ee0f093ef678f5a36d1c982296f4e15bbcbd7275ced72c3e9b2fc754039ba663d0612ffd866
+DIST dotnet-sdk-6.0.202-linux-x64.tar.gz 176864364 BLAKE2B b4460b1a417976e30c8ba2966d0fcc7bb57b705b98585c725559a122326a9bad8a3c647102d70cc1304dafefa48c80af2dc96cfa4c333b06ccd9542d202c8ae0 SHA512 81e9c368d445d9e92e3af471d52dc2aa05e3ecb75ce95c13a2ed1d117852dae43d23d913bbe92eab730aef7f38a14488a1ac65c3b79444026a629647322c5798
+EBUILD dotnet-sdk-bin-3.1.418-r1.ebuild 1351 BLAKE2B 00f25bf5d46fd38e72e0e314073bec7cf9a055c003fae514eda78549f3df5a39a57c581707ac508f6f0c3fa90ce005f5da1e68c2598060f349a2d514000dcd32 SHA512 1d7ff3b046a170550ffc7bf96aa26c237bf1a99b466d50ab1f54e16a04d1f9a68af4218892d32124652ffe376684d5741d3c3290027bd27d75c6e5beed864ae6
+EBUILD dotnet-sdk-bin-5.0.407-r1.ebuild 1406 BLAKE2B d2a551da0985c5aa6e25807c58edb85c805c262264b9ae04c512b7baaf1958c348f5a275afca03d41e90b6d0722fdb9277514349b146d0a16684231006073453 SHA512 ca9d8322ec76c8a23dc06fba8a97412088619aeaf78756bcd0cae42c5fb966513d16dc6fe28c28642c6bba4b79899d3aa5ff5f1d9bfb4e788d7b719b9282d832
+EBUILD dotnet-sdk-bin-6.0.202-r1.ebuild 1845 BLAKE2B 80d2c7eaee740d4439727635ec1f259c0777dce8df5ee17cffa630602f001003aa5293a325381938f99b77e315bc7eec3efea5e11f6aef4cf6c6ccfc566c145c SHA512 cd92c22a1f40f0dac9f70641e10e98267acbe4fd62987b63a982bc14b117c4eb466bd8b4e2eff0876afe3e4b1e53e5e86c4436ac76dfe44f263733330b36cbec
+MISC metadata.xml 454 BLAKE2B 566ca4d2c6acc7068bacccbf6e260b2a6f5ee67b44e3b48f9e146643c506525c8a15c5c08bb0f9f4e7c69f4ea27f2af3daf14ca80d339697e066b92773f07c67 SHA512 ab935828418001d4c74bdd25f93d5b1fea8d614cb408c4b944a392c95696de0f7d14d93b9b44300e3e18c72bffd0e662454c2e0ac104f8b18c010cd6b87490be
diff --git a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-3.1.416.ebuild b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-3.1.416.ebuild
deleted file mode 100644
index a6cb8b1e7120..000000000000
--- a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-3.1.416.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PV="${PV}"
-
-DESCRIPTION=".NET is a free, cross-platform, open-source developer platform"
-HOMEPAGE="https://dotnet.microsoft.com/"
-LICENSE="MIT"
-
-SRC_URI="
-amd64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${MY_PV}/dotnet-sdk-${MY_PV}-linux-x64.tar.gz )
-arm? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${MY_PV}/dotnet-sdk-${MY_PV}-linux-arm.tar.gz )
-arm64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${MY_PV}/dotnet-sdk-${MY_PV}-linux-arm64.tar.gz )
-"
-
-SLOT="3.1"
-KEYWORDS="~amd64 ~arm ~arm64"
-IUSE="+dotnet-symlink"
-REQUIRED_USE="elibc_glibc"
-QA_PREBUILT="*"
-RESTRICT+=" splitdebug"
-RDEPEND="
-	app-crypt/mit-krb5:0/0
-	dev-util/lttng-ust:0
-	sys-libs/zlib:0/1
-	dotnet-symlink? ( !dev-dotnet/dotnet-sdk[dotnet-symlink(+)] )
-"
-
-S=${WORKDIR}
-
-src_install() {
-	local dest="opt/${PN}-${SLOT}"
-	dodir "${dest%/*}"
-
-	{ mv "${S}" "${ED}/${dest}" && mkdir "${S}" && fperms 0755 "/${dest}"; } || die
-	dosym "../../${dest}/dotnet" "/usr/bin/dotnet-bin-${SLOT}"
-
-	if use dotnet-symlink; then
-		dosym "../../${dest}/dotnet" "/usr/bin/dotnet"
-		dosym "../../${dest}/dotnet" "/usr/bin/dotnet-${SLOT}"
-
-		# set an env-variable for 3rd party tools
-		echo "DOTNET_ROOT=/${dest}" > "${T}/90${PN}-${SLOT}" || die
-		doenvd "${T}/90${PN}-${SLOT}"
-	fi
-}
diff --git a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-3.1.417.ebuild b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-3.1.418-r1.ebuild
similarity index 96%
rename from dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-3.1.417.ebuild
rename to dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-3.1.418-r1.ebuild
index a6cb8b1e7120..dabeb4bdbf70 100644
--- a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-3.1.417.ebuild
+++ b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-3.1.418-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
 MY_PV="${PV}"
 
diff --git a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-5.0.301.ebuild b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-5.0.301.ebuild
deleted file mode 100644
index 5adae138eb9c..000000000000
--- a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-5.0.301.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PV="${PV}"
-
-DESCRIPTION=".NET is a free, cross-platform, open-source developer platform"
-HOMEPAGE="https://dotnet.microsoft.com/"
-LICENSE="MIT"
-
-SRC_URI="
-amd64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${MY_PV}/dotnet-sdk-${MY_PV}-linux-x64.tar.gz )
-arm? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${MY_PV}/dotnet-sdk-${MY_PV}-linux-arm.tar.gz )
-arm64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${MY_PV}/dotnet-sdk-${MY_PV}-linux-arm64.tar.gz )
-"
-
-SLOT="5.0"
-KEYWORDS="~amd64 ~arm ~arm64"
-IUSE="+dotnet-symlink"
-REQUIRED_USE="elibc_glibc"
-QA_PREBUILT="*"
-RESTRICT+=" splitdebug"
-RDEPEND="
-	app-crypt/mit-krb5:0/0
-	dev-util/lttng-ust:0
-	sys-libs/zlib:0/1
-	dotnet-symlink? (
-		!dev-dotnet/dotnet-sdk[dotnet-symlink(+)]
-		!dev-dotnet/dotnet-sdk-bin:3.1[dotnet-symlink(+)]
-	)
-"
-
-S=${WORKDIR}
-
-src_install() {
-	local dest="opt/${PN}-${SLOT}"
-	dodir "${dest%/*}"
-
-	{ mv "${S}" "${ED}/${dest}" && mkdir "${S}" && fperms 0755 "/${dest}"; } || die
-	dosym "../../${dest}/dotnet" "/usr/bin/dotnet-bin-${SLOT}"
-
-	if use dotnet-symlink; then
-		dosym "../../${dest}/dotnet" "/usr/bin/dotnet"
-		dosym "../../${dest}/dotnet" "/usr/bin/dotnet-${SLOT}"
-
-		# set an env-variable for 3rd party tools
-		echo "DOTNET_ROOT=/${dest}" > "${T}/90${PN}-${SLOT}" || die
-		doenvd "${T}/90${PN}-${SLOT}"
-	fi
-}
diff --git a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-5.0.405.ebuild b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-5.0.405.ebuild
deleted file mode 100644
index 5adae138eb9c..000000000000
--- a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-5.0.405.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PV="${PV}"
-
-DESCRIPTION=".NET is a free, cross-platform, open-source developer platform"
-HOMEPAGE="https://dotnet.microsoft.com/"
-LICENSE="MIT"
-
-SRC_URI="
-amd64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${MY_PV}/dotnet-sdk-${MY_PV}-linux-x64.tar.gz )
-arm? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${MY_PV}/dotnet-sdk-${MY_PV}-linux-arm.tar.gz )
-arm64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${MY_PV}/dotnet-sdk-${MY_PV}-linux-arm64.tar.gz )
-"
-
-SLOT="5.0"
-KEYWORDS="~amd64 ~arm ~arm64"
-IUSE="+dotnet-symlink"
-REQUIRED_USE="elibc_glibc"
-QA_PREBUILT="*"
-RESTRICT+=" splitdebug"
-RDEPEND="
-	app-crypt/mit-krb5:0/0
-	dev-util/lttng-ust:0
-	sys-libs/zlib:0/1
-	dotnet-symlink? (
-		!dev-dotnet/dotnet-sdk[dotnet-symlink(+)]
-		!dev-dotnet/dotnet-sdk-bin:3.1[dotnet-symlink(+)]
-	)
-"
-
-S=${WORKDIR}
-
-src_install() {
-	local dest="opt/${PN}-${SLOT}"
-	dodir "${dest%/*}"
-
-	{ mv "${S}" "${ED}/${dest}" && mkdir "${S}" && fperms 0755 "/${dest}"; } || die
-	dosym "../../${dest}/dotnet" "/usr/bin/dotnet-bin-${SLOT}"
-
-	if use dotnet-symlink; then
-		dosym "../../${dest}/dotnet" "/usr/bin/dotnet"
-		dosym "../../${dest}/dotnet" "/usr/bin/dotnet-${SLOT}"
-
-		# set an env-variable for 3rd party tools
-		echo "DOTNET_ROOT=/${dest}" > "${T}/90${PN}-${SLOT}" || die
-		doenvd "${T}/90${PN}-${SLOT}"
-	fi
-}
diff --git a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-5.0.406.ebuild b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-5.0.407-r1.ebuild
similarity index 96%
rename from dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-5.0.406.ebuild
rename to dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-5.0.407-r1.ebuild
index 5adae138eb9c..35084c97d1ab 100644
--- a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-5.0.406.ebuild
+++ b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-5.0.407-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
 MY_PV="${PV}"
 
diff --git a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.100.ebuild b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.100.ebuild
deleted file mode 100644
index 237308fc0fc2..000000000000
--- a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.100.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PV="${PV}"
-
-DESCRIPTION=".NET is a free, cross-platform, open-source developer platform"
-HOMEPAGE="https://dotnet.microsoft.com/"
-LICENSE="MIT"
-
-SRC_URI="
-amd64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${MY_PV}/dotnet-sdk-${MY_PV}-linux-x64.tar.gz )
-arm? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${MY_PV}/dotnet-sdk-${MY_PV}-linux-arm.tar.gz )
-arm64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${MY_PV}/dotnet-sdk-${MY_PV}-linux-arm64.tar.gz )
-"
-
-SLOT="6.0"
-KEYWORDS="~amd64 ~arm ~arm64"
-IUSE="+dotnet-symlink"
-REQUIRED_USE="elibc_glibc"
-QA_PREBUILT="*"
-RESTRICT+=" splitdebug"
-RDEPEND="
-	app-crypt/mit-krb5:0/0
-	dev-util/lttng-ust:0
-	sys-libs/zlib:0/1
-	dotnet-symlink? (
-		!dev-dotnet/dotnet-sdk[dotnet-symlink(+)]
-		!dev-dotnet/dotnet-sdk-bin:3.1[dotnet-symlink(+)]
-		!dev-dotnet/dotnet-sdk-bin:5.0[dotnet-symlink(+)]
-	)
-"
-
-S=${WORKDIR}
-
-src_install() {
-	local dest="opt/${PN}-${SLOT}"
-	dodir "${dest%/*}"
-
-	# 6.0.100 is SDK feature band which will not change between minor increases, so 6.0.101, 6.102
-	# will still have same 6.0.100 SDK feature band in the name. Thus I have to hard code this
-	# https://github.com/dotnet/sdk/pull/18823#issuecomment-915603684
-	local workloads="metadata/workloads/${SLOT}.100"
-
-	{ mkdir -p "${S}/${workloads}" && touch "${S}/${workloads}/userlocal"; } || die
-	{ mv "${S}" "${ED}/${dest}" && mkdir "${S}" && fperms 0755 "/${dest}"; } || die
-	dosym "../../${dest}/dotnet" "/usr/bin/dotnet-bin-${SLOT}"
-
-	if use dotnet-symlink; then
-		dosym "../../${dest}/dotnet" "/usr/bin/dotnet"
-		dosym "../../${dest}/dotnet" "/usr/bin/dotnet-${SLOT}"
-
-		# set an env-variable for 3rd party tools
-		echo "DOTNET_ROOT=/${dest}" > "${T}/90${PN}-${SLOT}" || die
-		doenvd "${T}/90${PN}-${SLOT}"
-	fi
-}
diff --git a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.102.ebuild b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.102.ebuild
deleted file mode 100644
index 237308fc0fc2..000000000000
--- a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.102.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PV="${PV}"
-
-DESCRIPTION=".NET is a free, cross-platform, open-source developer platform"
-HOMEPAGE="https://dotnet.microsoft.com/"
-LICENSE="MIT"
-
-SRC_URI="
-amd64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${MY_PV}/dotnet-sdk-${MY_PV}-linux-x64.tar.gz )
-arm? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${MY_PV}/dotnet-sdk-${MY_PV}-linux-arm.tar.gz )
-arm64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${MY_PV}/dotnet-sdk-${MY_PV}-linux-arm64.tar.gz )
-"
-
-SLOT="6.0"
-KEYWORDS="~amd64 ~arm ~arm64"
-IUSE="+dotnet-symlink"
-REQUIRED_USE="elibc_glibc"
-QA_PREBUILT="*"
-RESTRICT+=" splitdebug"
-RDEPEND="
-	app-crypt/mit-krb5:0/0
-	dev-util/lttng-ust:0
-	sys-libs/zlib:0/1
-	dotnet-symlink? (
-		!dev-dotnet/dotnet-sdk[dotnet-symlink(+)]
-		!dev-dotnet/dotnet-sdk-bin:3.1[dotnet-symlink(+)]
-		!dev-dotnet/dotnet-sdk-bin:5.0[dotnet-symlink(+)]
-	)
-"
-
-S=${WORKDIR}
-
-src_install() {
-	local dest="opt/${PN}-${SLOT}"
-	dodir "${dest%/*}"
-
-	# 6.0.100 is SDK feature band which will not change between minor increases, so 6.0.101, 6.102
-	# will still have same 6.0.100 SDK feature band in the name. Thus I have to hard code this
-	# https://github.com/dotnet/sdk/pull/18823#issuecomment-915603684
-	local workloads="metadata/workloads/${SLOT}.100"
-
-	{ mkdir -p "${S}/${workloads}" && touch "${S}/${workloads}/userlocal"; } || die
-	{ mv "${S}" "${ED}/${dest}" && mkdir "${S}" && fperms 0755 "/${dest}"; } || die
-	dosym "../../${dest}/dotnet" "/usr/bin/dotnet-bin-${SLOT}"
-
-	if use dotnet-symlink; then
-		dosym "../../${dest}/dotnet" "/usr/bin/dotnet"
-		dosym "../../${dest}/dotnet" "/usr/bin/dotnet-${SLOT}"
-
-		# set an env-variable for 3rd party tools
-		echo "DOTNET_ROOT=/${dest}" > "${T}/90${PN}-${SLOT}" || die
-		doenvd "${T}/90${PN}-${SLOT}"
-	fi
-}
diff --git a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.201.ebuild b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.201.ebuild
deleted file mode 100644
index 237308fc0fc2..000000000000
--- a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.201.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PV="${PV}"
-
-DESCRIPTION=".NET is a free, cross-platform, open-source developer platform"
-HOMEPAGE="https://dotnet.microsoft.com/"
-LICENSE="MIT"
-
-SRC_URI="
-amd64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${MY_PV}/dotnet-sdk-${MY_PV}-linux-x64.tar.gz )
-arm? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${MY_PV}/dotnet-sdk-${MY_PV}-linux-arm.tar.gz )
-arm64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${MY_PV}/dotnet-sdk-${MY_PV}-linux-arm64.tar.gz )
-"
-
-SLOT="6.0"
-KEYWORDS="~amd64 ~arm ~arm64"
-IUSE="+dotnet-symlink"
-REQUIRED_USE="elibc_glibc"
-QA_PREBUILT="*"
-RESTRICT+=" splitdebug"
-RDEPEND="
-	app-crypt/mit-krb5:0/0
-	dev-util/lttng-ust:0
-	sys-libs/zlib:0/1
-	dotnet-symlink? (
-		!dev-dotnet/dotnet-sdk[dotnet-symlink(+)]
-		!dev-dotnet/dotnet-sdk-bin:3.1[dotnet-symlink(+)]
-		!dev-dotnet/dotnet-sdk-bin:5.0[dotnet-symlink(+)]
-	)
-"
-
-S=${WORKDIR}
-
-src_install() {
-	local dest="opt/${PN}-${SLOT}"
-	dodir "${dest%/*}"
-
-	# 6.0.100 is SDK feature band which will not change between minor increases, so 6.0.101, 6.102
-	# will still have same 6.0.100 SDK feature band in the name. Thus I have to hard code this
-	# https://github.com/dotnet/sdk/pull/18823#issuecomment-915603684
-	local workloads="metadata/workloads/${SLOT}.100"
-
-	{ mkdir -p "${S}/${workloads}" && touch "${S}/${workloads}/userlocal"; } || die
-	{ mv "${S}" "${ED}/${dest}" && mkdir "${S}" && fperms 0755 "/${dest}"; } || die
-	dosym "../../${dest}/dotnet" "/usr/bin/dotnet-bin-${SLOT}"
-
-	if use dotnet-symlink; then
-		dosym "../../${dest}/dotnet" "/usr/bin/dotnet"
-		dosym "../../${dest}/dotnet" "/usr/bin/dotnet-${SLOT}"
-
-		# set an env-variable for 3rd party tools
-		echo "DOTNET_ROOT=/${dest}" > "${T}/90${PN}-${SLOT}" || die
-		doenvd "${T}/90${PN}-${SLOT}"
-	fi
-}
diff --git a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.101.ebuild b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.202-r1.ebuild
similarity index 97%
rename from dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.101.ebuild
rename to dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.202-r1.ebuild
index 237308fc0fc2..4a71ab6b42e1 100644
--- a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.101.ebuild
+++ b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.202-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
 MY_PV="${PV}"
 
diff --git a/dev-dotnet/dotnet-sdk-bin/metadata.xml b/dev-dotnet/dotnet-sdk-bin/metadata.xml
index 52a1104129ee..d314af548ed1 100644
--- a/dev-dotnet/dotnet-sdk-bin/metadata.xml
+++ b/dev-dotnet/dotnet-sdk-bin/metadata.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
 <pkgmetadata>
-	<maintainer type="project">
-		<email>dotnet@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<doc>https://docs.microsoft.com/en-us/dotnet/</doc>
-	</upstream>
-	<use>
-		<flag name="dotnet-symlink">
-			Install a dotnet symlink that points to dotnet-bin.
-		</flag>
-	</use>
+  <maintainer type="person">
+    <email>xgqt@gentoo.org</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <upstream>
+    <doc>https://docs.microsoft.com/en-us/dotnet/</doc>
+  </upstream>
+  <use>
+    <flag name="dotnet-symlink">
+      Install a dotnet symlink that points to dotnet-bin.
+    </flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 5cb0b8e768f6..a1ca46827318 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest
index a31aa17d93a2..e19808656d46 100644
--- a/dev-lang/nim/Manifest
+++ b/dev-lang/nim/Manifest
@@ -2,7 +2,9 @@ AUX nim-0.20.0-paths.patch 934 BLAKE2B 6a4e44c5656cde6d5127bf6a6b8db92cdf8aada08
 DIST nim-1.4.8.tar.xz 4786360 BLAKE2B 961b38275c4f9de87ac522c5b47368ce7f5543811a2dfd7b4f3fd79a104bcd0458caaaaab1705f99eb42c64735ca5f71d5018f8a8275a430d883233b28b1d412 SHA512 e6b245271495880f0eea271c46b4f5ce9168a421716a9a22367b6be3c2a9822937aad1f48eb61c151b040ac961728a89c8a6d143c8300057c0d8c1f2d66f3dd3
 DIST nim-1.6.2.tar.xz 5181616 BLAKE2B adedbcaad1b135b6f99459894856190103e2d2b678849e0418f77c02a54fde44224456ea13949f3fe9f5f020a90adde46593497895674bd9ae892b17708df292 SHA512 052b62c987035f7633f965356993cd4eec686f4f4f5c675cf966d82cb30fcf574045887a4402bcc20e487299fb5e8f65a921951c2dc21ac334e695e31d95d992
 DIST nim-1.6.4.tar.xz 5130208 BLAKE2B d0f297581677bbb9fb185a8b4198f48bb58efe81a1624f62051bc1e0a93f879a0cec172f11a41784ca715ba3c151dc5307e96c15c54908aa40df406040891d6c SHA512 f4d082f37f0e675e8cdb4340d67f2e58b5e6ac5bb51dab1ded5417097f3b86d71fa585ef12ee1c3cd5b17285589cbe9d5658fcb29c98547f7967a1b6f0cb4646
+DIST nim-1.6.6.tar.xz 5149956 BLAKE2B 2fd1b40f1ecc1200255052d9e013c55287d3e01337146d0b1386d0f3fc9c14fda1e8e82ee289e782c77a573c1ae0985ea7f900f61e6b9824a9eb4b5c803c7f71 SHA512 6ea8d3f61adae48184dd0e3ac393296fd3bd5ead818e7dee949f43eccbd0b6229ebfc474353ddd63cc734f82c3247998fbfe88362061983f978ad8d0ab7fa677
 EBUILD nim-1.4.8.ebuild 2078 BLAKE2B 2a9781ebc99b6ae00c67f3034e71b8adff46f1452f628187975219ea73ee6c60f6176dc55fa0520cd83f0969302906fe79f5d87aae17cf539447a8fb1e1bf169 SHA512 3d38c1304c76727461e7e7bcc5b85770c42364da5b3c01fcada9c8528146687cab141e9acbf47b82ef85c68f892882c0266c76fb25d3ee39e84422dafee6be73
 EBUILD nim-1.6.2.ebuild 2139 BLAKE2B 9ce2020017887e5403aefd67712ffbf0b4f6c42c7f5ad96eddac2fef3afdafbd6f6264dd27eea2b6968b0dd816d714ccb1a8bf7debed5a338cf7a65c24ce4eb7 SHA512 b910a98baac46d490be0764b79f6438a61e2ed6dfa5f998102bf52ae7dead628a1aabb2e488860c61d6f9eef54f27477797e654a588c4ee8ba67cbe3ef8c13eb
 EBUILD nim-1.6.4.ebuild 2150 BLAKE2B df6e12e923f86d1ae2fd7f97c3d58884aaffae1f6db49f1fe0bda6d4f566716b398f638277697ad3850f8d00bdda1f36508e0740a7c7b1e6cc728b1671db7382 SHA512 5fa6a5df5374ef85198095e08647a3c1bad33ad999eb18458ae593b65f964c30c805488eab360a793a5a0c8ca9df6dba45d000edbbff16d6e19602339f6d3786
+EBUILD nim-1.6.6.ebuild 2150 BLAKE2B df6e12e923f86d1ae2fd7f97c3d58884aaffae1f6db49f1fe0bda6d4f566716b398f638277697ad3850f8d00bdda1f36508e0740a7c7b1e6cc728b1671db7382 SHA512 5fa6a5df5374ef85198095e08647a3c1bad33ad999eb18458ae593b65f964c30c805488eab360a793a5a0c8ca9df6dba45d000edbbff16d6e19602339f6d3786
 MISC metadata.xml 1894 BLAKE2B 8ba43a558af584b0c455e16f6d710a2482fbd3d8a4ae80817ee0080165227e931f40b2269d6316ca4fc8773cea0e6d941feafcc30d8a2eb5eb0843d8f7e7df71 SHA512 6fbc92e65c8a85c82cba372aba12133acc626c2a33ec35aff4a02246e70f64dd06c51af121f17fb5cbab48df1aafa3e9af9375a1ccbd769590e26078a7dacf88
diff --git a/dev-lang/nim/nim-1.6.6.ebuild b/dev-lang/nim/nim-1.6.6.ebuild
new file mode 100644
index 000000000000..11af93abf307
--- /dev/null
+++ b/dev-lang/nim/nim-1.6.6.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 multiprocessing toolchain-funcs
+
+DESCRIPTION="compiled, garbage-collected systems programming language"
+HOMEPAGE="https://nim-lang.org/"
+SRC_URI="https://nim-lang.org/download/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug +readline"
+RESTRICT="test"  # need to sort out depends and numerous failures
+
+RDEPEND="readline? ( sys-libs/readline:0= )"
+DEPEND="${RDEPEND}"
+# BDEPEND="test? ( net-libs/nodejs )"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.20.0-paths.patch )
+
+# Generated by nim
+QA_FLAGS_IGNORED="
+usr/bin/atlas
+usr/bin/nim
+usr/bin/nim_dbg
+usr/bin/nimble
+usr/bin/nimgrep
+usr/bin/nimpretty
+usr/bin/nimsuggest
+usr/bin/testament
+"
+
+_run() {
+	echo "Running: ${@}"
+	PATH="${S}/bin:${PATH}" "${@}" || die "Failed: \"${*}\""
+}
+
+nim_use_enable() {
+	[[ -z "${2}" ]] && die "usage: nim_use_enable <USE flag> <compiler flag>"
+	use "${1}" && echo "-d:${2}"
+}
+
+src_configure() {
+	export XDG_CACHE_HOME="${T}/cache"  # 667182
+	unset NIMBLE_DIR
+	tc-export CC CXX LD
+
+	local build_type
+	if use debug ; then
+		build_type="debug"
+	else
+		build_type="release"
+	fi
+	export NIM_OPTS=( --parallelBuild:$(makeopts_jobs) -d:${build_type} )
+
+	# Override defaults
+	echo "gcc.exe            = \"$(tc-getCC)\""  >> config/nim.cfg || die
+	echo "gcc.linkerexe      = \"$(tc-getCC)\""  >> config/nim.cfg || die
+	echo "gcc.cpp.exe        = \"$(tc-getCXX)\"" >> config/nim.cfg || die
+	echo "gcc.cpp.linkerexe  = \"$(tc-getCXX)\"" >> config/nim.cfg || die
+}
+
+src_compile() {
+	_run bash ./build.sh
+
+	_run ./bin/nim ${NIM_OPTS[@]} compile koch
+	_run ./koch boot ${NIM_OPTS[@]} $(nim_use_enable readline useGnuReadline)
+	_run ./koch tools ${NIM_OPTS[@]}
+}
+
+src_test() {
+	_run ./koch test
+}
+
+src_install() {
+	_run ./koch install "${ED}"
+
+	# "./koch install" installs only "nim" binary
+	# but not the rest
+	exeinto /usr/bin
+	local exe
+	for exe in bin/* ; do
+		[[ "${exe}" == bin/nim ]] && continue
+		doexe "${exe}"
+	done
+
+	newbashcomp tools/nim.bash-completion nim
+	newbashcomp dist/nimble/nimble.bash-completion nimble
+}
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index f10038279e6a..d02c604a2ea0 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -23,7 +23,7 @@ DIST python-gentoo-patches-3.8.13.tar.xz 16004 BLAKE2B 5c0c6c9263570a467391e60c3
 DIST python-gentoo-patches-3.9.11.tar.xz 12844 BLAKE2B de7ffa39e96127949d2b894fe15c8c1345180842791743af14a3728a7c950e877ab7c74f3e72da5518b16ecb2f3ff13e6132740bb067fe43a8359c673befbaf5 SHA512 0507792188587e66d63a70dde17c6aea1c9aab9e40ace3aeb585adbd2c62acf828782312ba7523f7a4ea49ab1125a30c7b091d10fe02874b018f2733fb8e141d
 DIST python-gentoo-patches-3.9.12.tar.xz 12848 BLAKE2B 5dd66fa94b136a463d2c4be3a5b7dfad770c3905467a1d81af02a35b2783ce7d614881c915ee8f8e764c1656963d6886d9c60c6e524f512e1bc496e42d01307b SHA512 07de63e47a8e547724099062239df8fcfd254f19d38be28131e6bbb094ffbab8483861fb6a5905e60d7fa7a1a5dc06785951fa31984ecad89516b0b742c47f91
 EBUILD python-2.7.18_p14.ebuild 9899 BLAKE2B 89bd80ccd09e15edb4b8be45b620d17f7d220551e25f373cea50e9aa593cf2e42660a54a65f56f46783964a23076e182afd4fe36d709c22cee0e5745be75142d SHA512 4e8916ec74ed0e2921c50a9d7f27e62922fd0c0f52d87b870c3ae36161ac303c0a146ba3a61d0e2ce5b6c2d2f6d5798f696fc750642594a5cad6b396caa626fd
-EBUILD python-2.7.18_p15.ebuild 9900 BLAKE2B 60e0b1ff8ead3e5a8ae7b1ea9675673760bae28ea45002fc612ef728682880daabf165b63d5cfbb1e06473cc768d6e5bc0316b33619aa6f4bc5764480d179072 SHA512 42b3c6b32e3c76492eb4000228779f3b53ce46908e375123d0f4ef76f325cf2f738845cde86d8120a3d18694d211a380ea118ced101c423e1a4aac99191a93d6
+EBUILD python-2.7.18_p15.ebuild 9899 BLAKE2B 89bd80ccd09e15edb4b8be45b620d17f7d220551e25f373cea50e9aa593cf2e42660a54a65f56f46783964a23076e182afd4fe36d709c22cee0e5745be75142d SHA512 4e8916ec74ed0e2921c50a9d7f27e62922fd0c0f52d87b870c3ae36161ac303c0a146ba3a61d0e2ce5b6c2d2f6d5798f696fc750642594a5cad6b396caa626fd
 EBUILD python-3.10.4.ebuild 11780 BLAKE2B b0190ecfb8563fd10cc494f9471092024b20a47d1287833d7bfd8ff5f33ec69561a80db44ebcf39ac36680d7e1729f293ba7cebb660451e0866f29fdaa98df4b SHA512 fcb0a73e107ecb09a173a6e3a0d99e1898471f3b8e975f378df36b370cca73c4a461f82006c903a0aed2ceec4e950847d82ff5b526aa805c69d78d94c1f06100
 EBUILD python-3.11.0_alpha7.ebuild 11710 BLAKE2B 770d65ad0b6e6ea2a1dead8d70d3ef0c72ca0f06c713f29e68f618c2038916630ec2e6f5be6d0e3ccfbbfd97099bda01541effa2c851420d568c1cf85194bb1b SHA512 1a6c17321063bfba0d7b7cda8b665e38bfa6ed7e0287727ac8b4fcd21b0eb9da1918f61d69c1abef71686393700bc9fc29375e4967df8c08fe5e241580e9c9c0
 EBUILD python-3.7.13.ebuild 9963 BLAKE2B 1efd117f0f0d86e2b456a360b04a299ac710c2883b287bbcf7fce2da502fa8c48d474a7d9a8a70e219b51a613c656dd18a77fd8aefd3283409e5a3fb2fd3abec SHA512 857dc5cda9e6285ea6a3ebf8e287188add38447625903f24c27dcb1aa3700a7aba34af52e820d82200a15b00f692ec81c27eb305c72b6d609806d8652aadf681
diff --git a/dev-lang/python/python-2.7.18_p15.ebuild b/dev-lang/python/python-2.7.18_p15.ebuild
index eb4017fe5b81..da93a624d8f9 100644
--- a/dev-lang/python/python-2.7.18_p15.ebuild
+++ b/dev-lang/python/python-2.7.18_p15.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-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="berkdb bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl tk wininst +xml"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index b4b8a477b274..049bf1a9d384 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -21,6 +21,6 @@ DIST ruby-3.1.2.tar.xz 15101588 BLAKE2B 3f06d432f023d65c4808379140c18a922ad6c644
 EBUILD ruby-2.6.10.ebuild 7472 BLAKE2B 386d85cecc9f46fa13dec7f3fdc1d65fee1165363eb27d3619cd4b4223f34dd4d7b4822f2c7e0b3c1ff32732644eb5141f28d990d85dcf941e3cd00f9e3c02ac SHA512 412aee762366d876ac8fb01014d1eef69685ed75596aee837e070aba6984293b7fa0e866300a7e7679b1e0b6bd6f1e62a1a26111b1da24e5b902ae7bc2ac1beb
 EBUILD ruby-2.7.6.ebuild 7906 BLAKE2B 762bb7ad050fd0b9eaa751e05f8916f497463d4882ac012f7431ba973c4b06333c3d4d2ce77f0595c951db869375a9fed23056765ff2e4597505644a99c567d3 SHA512 98f5fd4c92c3a8c0401a7e42ddceea74b4e922a8fe442eda37d9d83ae074210b6497933aab1254c80b253608500ac888428c57ad12ac3693fe0fbdc276195939
 EBUILD ruby-3.0.4.ebuild 7761 BLAKE2B 8aa854ab1658d5a210a01425530371fcb8fb058448346e6ed3c60291f49949097886ca1f477e85b8765bbbda85002210bc10197cbc94871971e9bf7ae7037047 SHA512 a00ef7b71948c652e02ac997f277659f073610a264d3b64f4a627c9982958025dfa739d9cde9f28db28091af13491035ba7cd0fe47b423e850dda6a84e3dcb4e
-EBUILD ruby-3.1.2-r1.ebuild 7189 BLAKE2B d16e90b9de3a8e0a5bea010ae43685fb7a2f3d5be1eca23baf1cb55f821f91d7c928c7d46a02f2342e5c07fbb0950d19d0427ef83c319ccceaebf00d7fb3d1de SHA512 0e989a09b5cedbe063abdffd1604b7cf06561aaf341108dd2a9347c1874ffa29b7514d711f5cedf564da17764f80c66c0a92ad5ab80c2cd0b999f40b3bb35f6a
+EBUILD ruby-3.1.2-r1.ebuild 7379 BLAKE2B 820c5d27990c7694bc7804a98ed74f6ee919a068d8d5595ebe7d204e426b0ef2251c8b98546469cd60b1151317997c5ee2f7e17f9ca4ec77f09f60bc3bab287e SHA512 b8ff68fcee62c993b42f6cae2bdfa1198f9bbbbe5e287bc793d48ad249d3cfd8396d498cc92d8c144a4d1884f67adfb27df9e6ead48276ee4a750b86858a7868
 EBUILD ruby-3.1.2.ebuild 7716 BLAKE2B bbdc7631efe895a8eb09c8bd6d0e04fab70a98e372e8fb0118f5af69a7202df4235481312bfd335034642f18cea15af20cef230bed5ec0fb133801263828006f SHA512 bf97f0af405bfa386fb35b596663d2b75641d175902eaf2d93230561c4e2da1d6fc02c8bc9b9c12c963dbed2125de836eb9bb51b3107b69c28e792a4c6de610c
 MISC metadata.xml 524 BLAKE2B 78b64ea8e53d1bcfa249561354ef45ca34cdbcf6c4147944e98e6a17d884f5b4b29c0ddb6047bf2883a57f9a53386626bb7a779ef80ddcb33301d0e3822ead6b SHA512 1b254526486eb7d1d132f1286056d55963cb569ab47ccc94d625a9789e4dd3c45b5639510535543d96d2d7a3ccae13535e2e35ba9d78873d75ecac3bedfae762
diff --git a/dev-lang/ruby/ruby-3.1.2-r1.ebuild b/dev-lang/ruby/ruby-3.1.2-r1.ebuild
index 17f304b872ac..9f1eb80dffaf 100644
--- a/dev-lang/ruby/ruby-3.1.2-r1.ebuild
+++ b/dev-lang/ruby/ruby-3.1.2-r1.ebuild
@@ -84,8 +84,9 @@ src_prepare() {
 	einfo "Removing bundled libraries..."
 	rm -fr ext/fiddle/libffi-3.2.1 || die
 
-	# Remove tests that are known to fail
+	# Remove tests that are known to fail or require a network connection
 	rm -f test/ruby/test_process.rb test/rubygems/test_gem{,_path_support}.rb || die
+	rm -f test/rinda/test_rinda.rb test/socket/test_tcp.rb test/fiber/test_address_resolve.rb spec/ruby/library/socket/tcpsocket/{initialize,open}_spec.rb|| die
 
 	if use prefix ; then
 		# Fix hardcoded SHELL var in mkmf library
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 5f37d96f4096..0844668b5a50 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/json-c/Manifest b/dev-libs/json-c/Manifest
index 9e0e0370fb46..4dec26a6f98c 100644
--- a/dev-libs/json-c/Manifest
+++ b/dev-libs/json-c/Manifest
@@ -1,6 +1,6 @@
 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 1120 BLAKE2B 004080c692a81470b7d0d899aa02f46437b6f6e2830083250ba92e3acf785e575df64fd8fbc5172dbd774c3fab6f7a2a30ea33da2daccfa040891b0e3daee81b SHA512 c01c9fc58c79d9d8cba7bed9d1862b648f1c2f2f430fecd4942b5089e8638e7c031e7bf1f66a796251fbed5d153a8bf27cbfc949a4b6c81f3f51ea6a12ea02f0
+EBUILD json-c-0.16-r1.ebuild 1127 BLAKE2B 9d6b1f7cb7c0f7cea18638cdd5464b7efd9b15593f3d3344d1c56044ca18d01523fbf1c5a55f3fce8f53f685654bc32e3fc3d2bdd5f2aca1330eedb5ba1933fa SHA512 7a41107929c9c02cdbf06dcd0da960cd1f64b6a38b96aed9787e348eb01f2476a0415f9bc6e8a39370ec316ec07de37026a07630d0002b4f37609cd2d7d0e606
 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.16-r1.ebuild b/dev-libs/json-c/json-c-0.16-r1.ebuild
index fc5db4844302..394bbba72a15 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 ~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/libuv/Manifest b/dev-libs/libuv/Manifest
index 5ff9491e4949..cf0b9b5ef55a 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -2,6 +2,6 @@ AUX libuv-1.41.0-darwin.patch 1747 BLAKE2B a5a2d3ac70468515e395f69c9a80748d6db26
 DIST libuv-1.43.0.tar.gz 1295972 BLAKE2B 82cf4a0eff25aaf941eaa1b04030af1d21b758c0a99ba9cd3a13753879dcbea4f167d94b8e67de4d5674e02f84f9902198faa3159fc7e8f51d52391e842f46b8 SHA512 66ee11f8f6fc1313c432858572789cf67acd6364b29a06c73323ab20626e2d6e3d3dcea748cf5d9d4368b40ad7fe0d5fd35e9369c22e531db523703f005248d3
 DIST libuv-1.44.1.tar.gz 1301786 BLAKE2B 34418fbf8ddffe368b4df8f8b668888ec9f3e369c0d8794efa993ace5c37a3359a020d7868b9287b31abece6d0d3cf839ca412e959a4ee970650755f37247c29 SHA512 050b5f91540d126bef0a35681f8dd347296d3be32671b1c785494e78f5367b4ab064ece3f594523e09b08bcac284377d5fb123ba441fb570d25c5146aa484c8e
 EBUILD libuv-1.43.0.ebuild 1358 BLAKE2B fc897f62f27b258f4e88c69596d3c2141e01039156e6cd78cf4f1cca9b699d8304fcc8a30e3ff5270a9506d619a3ed10e56d6e40ae2b1c92d2665888213dad6a SHA512 6210053cb2667450a8b191677a6de94f7b5efc61ea7cd9fc0188984e18adb40d14bf232b77049117471deb29cb2973aa8f83006fe4d8c4bf8514a526eab94d2d
-EBUILD libuv-1.44.1.ebuild 1366 BLAKE2B 85fd9e7d2fd43d09e0abb7b37889a1be7feb75492662366b32886ea4184f1a90b6b204a66776b3c7d4eaabd930a7f6dcb5d1a24de4f3dd2120c2a7615ccc01f4 SHA512 d937d8f2868db83f15774af9c986756af2f20ba0b134cc96976105188c4d33a22841fc9cfb8dc48363ef415e59185882bcf086ec9258c4ad884eb8c1be04a91a
+EBUILD libuv-1.44.1.ebuild 1365 BLAKE2B 1ad06e6763bb46f2b3016acc135b308f94aa29dcd0d4879b6ce3280149ba036da9839ff9d579748c2bd127c94e7771ea562743d87f16fe7f36f254fa9197f393 SHA512 ea6b8f040d0c928a116d0b1c6c17e140b75789a47762f43dcb2f2ba389331b54448fc0560f276fc67bf7370c303f7f45d744e6b4cb3be12a0ef14033133d2119
 EBUILD libuv-9999.ebuild 1373 BLAKE2B a4fa4e88d0031b73a00987c6152489d8938dafc9371dde0a8e112aae256c7ad10e4eefb4989c18e0e70b5f7b48a20a63362325b3358b78c8baf583456139d86f SHA512 866bf4b77b09783c6277d08b53881007f46e11d4986e1a751c15bb71657113c4f86b3979066e70742d263b3dad10924de8d5b4f50293c90a0a40907aa4dfcd51
 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 451dfcea2c2f..b50c3ecd3eac 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 ~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/ntl/Manifest b/dev-libs/ntl/Manifest
index 8dbc4ea65886..175323e52e46 100644
--- a/dev-libs/ntl/Manifest
+++ b/dev-libs/ntl/Manifest
@@ -1,5 +1,5 @@
 DIST ntl-11.4.4.tar.gz 2378708 BLAKE2B 9a4c85bbe2fd2d3360988e0c350864fc0a05714e39ce3972228d93aba17f0dc079c90fbe40ab9d72116d1e31f55328bbd5cc71cd080e42ea33bc92361b4462aa SHA512 ed89d82008ca8785cb3d69de9577f42abe464dabf167ea2aaf801951843fc427d41171cbaac2f0cf68f35110d029cc28a65bd5aad69d30e7312f5ebcb0b58911
 DIST ntl-11.5.1.tar.gz 2304103 BLAKE2B 92284383451c7a810f7ee8d9a82836695d19d2a2e46b71c8c60b00acb77f4b4d3bad5497a309616a3e3188567d20203f5ad31295130ab0f3ace08417188c9fda SHA512 cf1f642b8a0f9cdc6dda888e07183817dc67ff494e56a852053aeb15b3d2a0e61fbc05824779c5d1f20b8115fba6f97266acf7e0b0b527c25df5989c86d5928f
 EBUILD ntl-11.4.4.ebuild 1704 BLAKE2B a32d148309c83276b1c56856917cb7c3a2b43c1ba4302cc6e6a634e63badf8d5aabdd48f534b72fa83718e1f797689df170ca88ea777d223a0ffeceab4f96688 SHA512 e20d5ba994de73f4762cf05a3a84ef14237849c9eae86c45f8a0ba40e8da08b2a3d855abfd8b921b95b25daeabff10bce1760ca5b263c341bcb256fff5c56d13
-EBUILD ntl-11.5.1-r1.ebuild 2074 BLAKE2B 67fc65a1f97bb89d7c3b254cc6e0d06d26a33a972217f27179a56e656837373c7bc4748aecdd27b2c0640b808d0f44180891469272824b36b6a45d1e5a501769 SHA512 5987d0c6f2061eb37cce499b1fea3b2f419089596a2627be4e6e61b57b3979834884a4016b57ed45a8c8a6e6881204101467bc822671f12b3c36084c41facc5e
+EBUILD ntl-11.5.1-r1.ebuild 2071 BLAKE2B 63b41f8d75761d7d002238955c7c3a8f81af90cd3db436eec1e5a30017995f2ffa2456d912e3b103bdb25d3916e5d6f94b17f70ae5960b91fa83bb870f3201a3 SHA512 71a9d39b67f2144522090613a9143585ae17727d200958a89ae7317d6dacaadcdf09d5d10fcca2c00c77f507243fd7e56bfef9cbdc989c42a27f828a8be18dc6
 MISC metadata.xml 553 BLAKE2B cdfae3ba1eecfe54b279aec52c8a122226eb0247dfad805feb9f0854705e99247f15e42dedd6d08164a8d9c9cc9db871a481f6bcebad3062ac32ad05c3c32b7b SHA512 ca5e891461461757b75aea48a2cf631cc871daf33159c1f2c2a9a9e6acad43db97733de1c24754709e9b4eb1173a50af3ce63690443ce5ddd6794de9580b0d19
diff --git a/dev-libs/ntl/ntl-11.5.1-r1.ebuild b/dev-libs/ntl/ntl-11.5.1-r1.ebuild
index babd1e7a505c..c625986daa0f 100644
--- a/dev-libs/ntl/ntl-11.5.1-r1.ebuild
+++ b/dev-libs/ntl/ntl-11.5.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.shoup.net/ntl/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/44"
-KEYWORDS="~amd64 ~arm64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist doc static-libs threads cpu_flags_x86_avx2"
 
 BDEPEND="dev-lang/perl"
diff --git a/dev-libs/plasma-wayland-protocols/Manifest b/dev-libs/plasma-wayland-protocols/Manifest
index f3d4dac67943..f562653caf30 100644
--- a/dev-libs/plasma-wayland-protocols/Manifest
+++ b/dev-libs/plasma-wayland-protocols/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-wayland-protocols-1.6.0.tar.xz 41752 BLAKE2B 63f733b63e6e707a340cfbfa0f0a774833e119ba53b8754ef6c05e09b42413284642740b9bcd6abfd7a06f1b651faf3807ee11121aa82b6ff9b1b20894f831cd SHA512 a9306d30032c46e8046ffbc8713e1afab732ee48a43922d0091cff25f0aaf407bee6fd08c333d9a83d064b903ebd1699d7d0ceadfe8b939ffd4d5e2129c22cf8
+DIST plasma-wayland-protocols-1.7.0.tar.xz 42000 BLAKE2B 581d6c375e7f17abd346ccc9482da46238fcf52a84c04d991ccdcb95bd4472dc6b2c2c612382ffd7cebdb669da00be05df9b0f5e58cc6767fcb7183b0e8ae459 SHA512 1ed01ce6af375c4012b3367377cea172446f2a7f1bef01c2e56dc2482c378955f9507e4e3bbb2ab316ba116ec181beaf9287f5b81199a02d5fd9eefb658bcb9c
 EBUILD plasma-wayland-protocols-1.6.0.ebuild 456 BLAKE2B e5ba5ecd1d0111f4c6567c1db52bb9e967f0831cdf48c031cfc77711a72566fb64b493fb8bdc8d9d4023e6bde06cd792fd929d1756888dac25caa2414167d3bb SHA512 57f44a144aca8e2545e0664e4c577b356c70c0785aa0380c450e8bad40e828a66adae19895ae95d4e11ab34404a9a5ae060b5821784e121ee98022fa60fc2c38
+EBUILD plasma-wayland-protocols-1.7.0.ebuild 459 BLAKE2B c05eae4ba93f37cf0039b597891869b52491a41a70d5e5170db96ffdaaf1771f0b131e58fb208dd48a955eafb282d8ab8787bf32b5ec201ee77969cbc93169d1 SHA512 46033ce4c2e0272546f775ce3361f6d2cb24364d6cdbb630918bddd358ed29d6d6c6a78472ab3bdd1af6b6526ef40fd1d587d0df0e25187b2b373e4adc49d30b
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.7.0.ebuild b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.7.0.ebuild
new file mode 100644
index 000000000000..1b2528ddee83
--- /dev/null
+++ b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.7.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_NONGUI=true
+KFMIN=5.82.0
+inherit ecm kde.org
+
+DESCRIPTION="Plasma Specific Protocols for Wayland"
+HOMEPAGE="https://invent.kde.org/libraries/plasma-wayland-protocols"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
diff --git a/dev-perl/Class-XSAccessor/Class-XSAccessor-1.190.0-r1.ebuild b/dev-perl/Class-XSAccessor/Class-XSAccessor-1.190.0-r1.ebuild
index fee50eb4c11b..15631dfdecd3 100644
--- a/dev-perl/Class-XSAccessor/Class-XSAccessor-1.190.0-r1.ebuild
+++ b/dev-perl/Class-XSAccessor/Class-XSAccessor-1.190.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Generate fast XS accessors without runtime compilation"
 # License note: perl 5-or-newer
 # https://bugs.gentoo.org/718946#c6
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~ppc-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Class-XSAccessor/Manifest b/dev-perl/Class-XSAccessor/Manifest
index 0f0f4ee5f869..2f7f59179c1a 100644
--- a/dev-perl/Class-XSAccessor/Manifest
+++ b/dev-perl/Class-XSAccessor/Manifest
@@ -1,3 +1,3 @@
 DIST Class-XSAccessor-1.19.tar.gz 80786 BLAKE2B 4650d7d6a4ab2783292ae567f7b43e7268f665c04698ebf245ff4eaf7d6405aae6497e7a1edd056aa948b061c353fe8912553f0dc84e21b152c56be3f42b2d4c SHA512 58855bb2108b60cc90ae1d1c4d6a011da7bac2d063c7c953ff8610ae164ba60731a664f0fbddf148e1eabb60042913a17633a9c9a8936a23a59130b381bf63f8
-EBUILD Class-XSAccessor-1.190.0-r1.ebuild 727 BLAKE2B ba00f2e28b611a9f1394fd376140dd8759f6e5532723075f51c32681179fe652b2a2268acca2ce18b765ddab8ae02951db588450f1cf74ae614d02d3cdae778f SHA512 b5f84d452301ba3af8bc7237ff8dd0e2da79b9ca56c53a284ffe12182d27b927dfd6b0faadd1f4485edb1e59924f52c776eb84e969cad721a4faa9cab2e65b58
+EBUILD Class-XSAccessor-1.190.0-r1.ebuild 726 BLAKE2B cb5d05351f6e0a24f82363dc3697972710d63aa574c6a4b22ef6ae439d60f163091166533cf834175cd35433e5851ee9ea1b84c3a92b4fc67a07ac854f079f06 SHA512 3ad95f5f3580d38d324bd6e04c26ed5374199a2ebc09a19a5f95414866e140fd7330578470d80d12998a893395ea2402191aed233ed8cb2a046d41606f5ca868
 MISC metadata.xml 476 BLAKE2B 15f5222ab2ac2056c747f2e80d656b13665a2d9e17e73941844044b0535e20cbffc553fbf543d6c56060a374f430cb4803f51bc7625ce8cefbd5b21fa71fd1ae SHA512 ba7108d4f0d479e9ba33e59da396ec1d274535e09b63cf26afaab81bf54549ff131b8dac1115f89b523d58c44d69188c1f0128f4ec54fd500d545b227306f6d9
diff --git a/dev-perl/Data-Dump/Data-Dump-1.250.0.ebuild b/dev-perl/Data-Dump/Data-Dump-1.250.0.ebuild
index 4039b2632c1a..79bed6ff14a6 100644
--- a/dev-perl/Data-Dump/Data-Dump-1.250.0.ebuild
+++ b/dev-perl/Data-Dump/Data-Dump-1.250.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Pretty printing of data structures"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips 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 ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-MIME-Base64
diff --git a/dev-perl/Data-Dump/Manifest b/dev-perl/Data-Dump/Manifest
index 9552904908e1..613bf28effff 100644
--- a/dev-perl/Data-Dump/Manifest
+++ b/dev-perl/Data-Dump/Manifest
@@ -1,5 +1,5 @@
 DIST Data-Dump-1.23.tar.gz 20771 BLAKE2B 04f28bc08e43a736cb9fc532883aecb85add98651e21f19a68387dd578efacc71ef85b567ed7f3c82a13a9e8ce84b0c4bebb9afffbb43f892f6b1adcd065ef92 SHA512 6fd6c23bb6df7f7396219149dbfd23132fc2ea1dd344c32f62fc27a1afeeb28d7ebf2d429184bb6d1189f412e218f9e62a966b49fdd9ad5564e5152d67a02b96
 DIST Data-Dump-1.25.tar.gz 20912 BLAKE2B c68ba6c3af8d5b963185c2643411afa294e12a0353baa08c12eb784640aa080926a0e6fc13f57071218fc4ac65d5a16ed12b14894319aee6625a0786a714d440 SHA512 fc859b0f02a44a959da3e162606c8fbaefececf8dbd0aa357d68a5a3143b818ae423dd7862063f2f77161ea000fcaa6841c96a2c4a268b889da9588292b157fe
 EBUILD Data-Dump-1.230.0-r1.ebuild 566 BLAKE2B eaa01ad2bb9ceb9536227220b63c136f811caebb0977d70b4b9fbf86e60f4725d4f1d637452f9d715f2fdc8b8696923150b2ad46b982ae91bde383c881107713 SHA512 6f24c2eff0f0c71aa648388bfe5be7c746f516d096a07ca14a7c9e9cc1fa671c9c0fa400aee08db21a6a4d4adccf5c732400af2081c40afaf24d4ad195436968
-EBUILD Data-Dump-1.250.0.ebuild 538 BLAKE2B 20f627e8d7d9dfc0a632ed304b8cbd3ca09199b7147b1956ab2fd5c8689c5bbaebeb8c3d0fcc1c8bf714db4fce4a9f1e2f1a84c9fc62f8683771ae70e75d6ea2 SHA512 34de2a10bdfb9eee86aa332f774fb8cd5bd72b58a9543881739114b6669d1e47c1a6005d5ba16fa40e464cab8f1b664030d6ca397d04dc9e15e7c6ba48060f07
+EBUILD Data-Dump-1.250.0.ebuild 537 BLAKE2B 232df45d2ff8a3be1b873af39c64e2303bc8e5631e99216084570b61721088d08241f0f43073fc93a3eb68e84b8536cdda5b4d9c5c57541fd361083aa751f976 SHA512 b834e78ba1e96b79968d45f67e31fc22f2c2938f4114beed3c9c8a273ee41c1eb3b317c6ada50f00243a95bbee0faeb73cb25d646f0e5f0587b0f98ae1cfe752
 MISC metadata.xml 737 BLAKE2B ab23794cd775658046a940cbb6f639a1019a1369c27bbeb19472fcd9e4e2034cf0c9b8d1e48bf73a0eb1d46fb8d60d1d11a413e3ff3ae005334d28e4ab05289b SHA512 bf1fda34977d5b035ea0df37b983a1dc682582a6ab8bef0d59401b999af01c9a89a505d7b23f5cd46e27ca97e22858c0d931654aef99131499f81f1f8e829cf9
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index a84552ff48cd..5916d21e8b4b 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Test-Trap/Manifest b/dev-perl/Test-Trap/Manifest
index 6cbbe4feb312..6ba2f856f25d 100644
--- a/dev-perl/Test-Trap/Manifest
+++ b/dev-perl/Test-Trap/Manifest
@@ -1,5 +1,5 @@
 DIST Test-Trap-v0.3.3.tar.gz 55053 BLAKE2B 5e55cfa802b018b68c3adb856d6622d5e625fff0b2c35563debb33a2e14b20f81e108a0d9025d6716fe9d784286821340cd4ad830697efd092e2bdf261f37311 SHA512 3a79bb0e201f2c740ea87baffda29141fc41e29b310bc9291da0e1cac0cf7f62a8c5cc70b94b68542cac7d6844d76c7fc1d3bbb91d86f8ba26a489d39883dd1e
 DIST Test-Trap-v0.3.4.tar.gz 55339 BLAKE2B 67200b2852786284e7c7200d0611e025cf39c1329a7e1fb51908ca02c36c85f991a3b0e437e87126ebede507ae5f00df37085da542d457eb481cd2c083533596 SHA512 cac4412a55511c820a1813a277afa802769a64219bf306190d83fea775c53bcd1d7faa275cb7f1b435e5ae274b6c1f78dd862525a6426040e51fdaf537e720ff
 EBUILD Test-Trap-0.3.3.ebuild 655 BLAKE2B 827bac6b6d9e38c6bbcbfb1e97a960878888b30faab214499eacd68e53754140acf73ea94ceea629ec57613a00f3e91c191a33cb02e963e77cf054a7667e9469 SHA512 0a723ab82d896c80cb70c0ef5ff25c8294a7b24b18dfa66ba6855204cccf336bfb44c0f0f59dcd15f2f5c4983c1c63daf13985d603abb9ccfbb8a8c3d9dfa04e
-EBUILD Test-Trap-0.3.4.ebuild 694 BLAKE2B 452d09e4f6aa3501def33ce3f75f4c5cb84e1a88630f1ef656a7a0026ccaf8c9bd467e640215f2322de230c8a6ec4ceafa1858c557146dcc05db7fd15bdc14c8 SHA512 810cfc5032521b2701350521c6d0d07801babe98e252ddc01dd2992b1cb9942b3dbde631d7075295e59b56114a3816557938caad31064c2a62ca2de29c78036b
+EBUILD Test-Trap-0.3.4.ebuild 693 BLAKE2B c47117e5d0b09f93d32bf36b9a71ae3cf8c300c862c2eeced858c7cb082be9822046da0676ffade8db6caad13e5834e767f1ae5b53638b785a752b5097551c45 SHA512 c6a51d7f1f8dbefca3d87fd71f39c5ca3f5bc0e1cb98a3e28ff3d4f6bc53937e941080a70e5ab465044d0142f97a42adcdd4dd77630f2b99a1e09a5b7e3f2a62
 MISC metadata.xml 685 BLAKE2B 3751bba9fce75901584d8b542b2264de2d9f25891aad01e707e1f9de109512a0b3873cc9d8a1361a06bc94ca7bf4a50fc404488ad37e3a37e71212e937e6598b SHA512 69cd66374bc60f6d24fe0a1c821190526bdea729f09ed2d4d894d7ef69ae36e67c466295cd5ead680b0ed4167db9f56aa54b3f75c9140548560f436cdd3b1405
diff --git a/dev-perl/Test-Trap/Test-Trap-0.3.4.ebuild b/dev-perl/Test-Trap/Test-Trap-0.3.4.ebuild
index 2ebef5cc63c3..eacb3a7c9276 100644
--- a/dev-perl/Test-Trap/Test-Trap-0.3.4.ebuild
+++ b/dev-perl/Test-Trap/Test-Trap-0.3.4.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Trap exit codes, exceptions, output, etc"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ~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 ~m68k ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 12981c593514..39b2fb75b375 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/ephemeral-port-reserve/Manifest b/dev-python/ephemeral-port-reserve/Manifest
index 44aa3b185652..9d87d1ef6847 100644
--- a/dev-python/ephemeral-port-reserve/Manifest
+++ b/dev-python/ephemeral-port-reserve/Manifest
@@ -1,3 +1,3 @@
 DIST ephemeral-port-reserve-1.1.4.gh.tar.gz 4839 BLAKE2B 843ddbfe8b102c10b3166628ba2aa1ef40f3314a74ac5e944e4e6c500f3f0d871424ca37dbbe64bc385352ba3ee9895884e82fd169962db8b6bf96aaf131d078 SHA512 e0412ac5ec362cffbd5efeb8c24a47ee36b50f2bf126438816824711f1f34412c903b116e96d4e541183925e7422b8f58bb0b7c5b819090d0f3d063cbf8c9f87
-EBUILD ephemeral-port-reserve-1.1.4.ebuild 648 BLAKE2B aa749f29afed5a24dbdbbac7e32af8f13f247f3350ac08f0b8576496cfc6abc0d5e3fd4736d861dd08be4ea45cc64dbbdcfb82d803a28895e25d958b59cda7c8 SHA512 7df6be62534cbed496d85cc482c5b342f11f5e5c1961629e192a354a5143a48fe5723e1e3f2fbae86ccf32ace2d62b83469a277b275ec29ede2893f2e0ff855c
+EBUILD ephemeral-port-reserve-1.1.4.ebuild 647 BLAKE2B adf0cc074acc2d56a421d1a13ba7ce01075746cb765cfa45520049382203c5ba0d3b3bd65ebc4e65428dd52b9837b4a18af9eb79b32e6dc58bc50d11aa2d017f SHA512 7295e615d3f411d4d578f026fffe72508c7bd0911e924b89dd7dad52c1c7bf0fc2b5ae3e4fff2c686241a41dc5073ea053305f5754563db7f4096393a9bfbbe4
 MISC metadata.xml 371 BLAKE2B 1ece78571254bc92c83621d671d74658de34133d33cdd1c902c06593058ff74ef82b2d4dc5d6a67af5c4d485e53f62818c063c11ae9f1c4a4f7fec20ac0a79e2 SHA512 d6096c1e95da471e04eb3571cc0cd780ad57dd392776064b874b2613f2d64749971851cafe1efdcc41a28a834c3ac6c6fa02117def2ce03cd65762c6ded6ceba
diff --git a/dev-python/ephemeral-port-reserve/ephemeral-port-reserve-1.1.4.ebuild b/dev-python/ephemeral-port-reserve/ephemeral-port-reserve-1.1.4.ebuild
index 74021ca69072..f6bbd8ef9d26 100644
--- a/dev-python/ephemeral-port-reserve/ephemeral-port-reserve-1.1.4.ebuild
+++ b/dev-python/ephemeral-port-reserve/ephemeral-port-reserve-1.1.4.ebuild
@@ -20,6 +20,6 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index d33129b161b3..7cdeeac11614 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,17 +1,13 @@
-DIST fonttools-4.30.0.tar.gz 2961097 BLAKE2B 23b592daa16fd215688f149d99258209b819caa843d26c889fb4016aae6d6614a9f87dd13fa1d2aa254fadb5169cf7d57ba02b7b15af79611995148d698ca2ec SHA512 2b4e676f956c3456bf3ca435a7d80e1a0a9f36872ba3a820072d1e13ed5751a8546f424369731afd4ccddc298ec0658bb4384d2e18670b108dd1b3a99fc205f4
-DIST fonttools-4.31.1.tar.gz 2964489 BLAKE2B d1bb7059383785dd527f7276ef876042f81d3e2cc5acc1b69e111b540cf8d35273a0070e6f0602ca438f35e3b83d0a04736cd5c97b1b7669822d1a6b1ad1b487 SHA512 cdf70f376e690ab1edc5e761ba45d1ddd7760c3aefdb5e9b88cc97118edd4ff694789c8b79ece791b4b6a597dcac1abb0eec5f0634f1db0792e5e62a2137282d
 DIST fonttools-4.31.2.tar.gz 2965796 BLAKE2B d776073e7a9358e67b8753dd4557e2b1b4c44d9662c8c728abe42d970bca1db1789a655df8865fef39eed3a32271749d2cb772e306f34efc87e737b7384c0b5d SHA512 50cc8bca9136675a413ac947b583f694d512872127cee129a78505d0259fe1cf6922f806558761af982758f72c7d95e1245b8de55b6ebd6ddd3bd7506d41abcf
 DIST fonttools-4.32.0.tar.gz 2966840 BLAKE2B 67a79c8c2e26f9f72fcf6ea4ab5ee3712d3541b47528a209221f9fcf82a5b5db589561200e4b6911a32102a4f4dc4b4e34c8271eb97b1cee18a81b3039efdf03 SHA512 a71a44601c7ec9f709ddc14da1c26d1248909fba8a0bfb7104ebe5f9b85949fe479c5eabdd2c94086d9999756035291e68bb7e861488d4123ccf667ac3ac2e03
 DIST fonttools-4.33.0.tar.gz 3525052 BLAKE2B 5ea275adbfbf6e01222f6eba8f5eef7afe533b9692e6a7a2fb644fb68dec632ab2962d6b7f6b4ff876676e8314aadbfc04a005ea7a389904e398723feaa756d0 SHA512 147f6d41d1a6b27ebe6973cb91a90384291ad8c7b75b71c3b814908012530066b79f4c39bdd6da9e98614ef61b1cc19803756aba73e4da7ce2e82147390f0023
 DIST fonttools-4.33.1.tar.gz 3526591 BLAKE2B c720e9159602168bc2f435f96e9b470e95a748e3e61aac717659e01e5998c8ead825056fe6114cb40be47ab1ebcd7dc6f3152cccd87aec5b49134147694aa3eb SHA512 14e4da0e146d4b88ab6375ad7c912f1ec6f437386e2d676bbffcd5a84be980151ed4f77f69bf618843b321106ca763af564cf05dfb6fa11888f02adfde7d74b2
 DIST fonttools-4.33.2.tar.gz 3526700 BLAKE2B faa8db2d5ba80a7cb2cd4fb82045aa821f72d296c3b0994f266c69bc1f38b9c46a24208612d539e3576d75371d95d49d9a103fed8ab7604ebf0df50ec8f25d2f SHA512 dd032f9f8d9167aa8d83137006062a5d293aeb4116cd2b24a9d5d3d750887876214a6b6e9fe54efd569cada64164c76f242b234569d86b45e5f279d6c1a5db95
 DIST fonttools-4.33.3.tar.gz 3526937 BLAKE2B 26539f76ac1919e572633695aca7a95f7f715ef18bd7d36de22e5491124ce36d3907f1e7b167d23685bca437f0bf7cf99159cd918ab2b1a450b716166d30fc37 SHA512 403e19cda46d67dea9f517e58c2e95ed04c53e6832919d85df9db4538431252e5ec4554e22410fd45cba634998de1576cf55d50f56de5ad497a108dcec4ed56a
-EBUILD fonttools-4.30.0.ebuild 1500 BLAKE2B ec68d09191d4dbed3cdd2cb5b4cf0cf2130f69fff3de3bf2656d6d179b90bd2bff078ac8d47ef87bbfc8d5cfbb13befa665b9c6025860b109eb468aa936faef3 SHA512 27d65f784809ed8d08a60c99d3c74fdb569181fd6865f985e1896dcfc0a521c5a879e59f8ca94743bf00d6e2184cbe60824e4391d77f944bb008801d706e4d56
-EBUILD fonttools-4.31.1.ebuild 1508 BLAKE2B cf5cf5a7b3fe8e4072306cfa26b7a88857d5ad42705053c0f2b19720dd0f3e8d2d62cc8f95aeba6265654aec4ba2abfa8878546d8928033a865e017b5e4500fe SHA512 895e925d66b9b740ef61909785d2c129b31ccbb6c85672414ef816cdd5b8a03a1579f8b276af84b2e06986f238b91460df540bc39d8bc3dcec920bf787fdfe52
-EBUILD fonttools-4.31.2.ebuild 1501 BLAKE2B d63faa7835c26eaa798ff07736c4c81a6c7f60dff28992fddb9c2282bcb49d257c8adb95b6bae8e188943bbd580a411d9eab73205814a925793b9c00741532ab SHA512 0a35af7f4b846584a3efa2312cb47034bbbbe87937db5cc847c678714f28e2bc478600d6de0d1bbd212f0746db714e7b814b083ce62378e817379a99fac2a1fc
+EBUILD fonttools-4.31.2.ebuild 1500 BLAKE2B ec68d09191d4dbed3cdd2cb5b4cf0cf2130f69fff3de3bf2656d6d179b90bd2bff078ac8d47ef87bbfc8d5cfbb13befa665b9c6025860b109eb468aa936faef3 SHA512 27d65f784809ed8d08a60c99d3c74fdb569181fd6865f985e1896dcfc0a521c5a879e59f8ca94743bf00d6e2184cbe60824e4391d77f944bb008801d706e4d56
 EBUILD fonttools-4.32.0.ebuild 1508 BLAKE2B cf5cf5a7b3fe8e4072306cfa26b7a88857d5ad42705053c0f2b19720dd0f3e8d2d62cc8f95aeba6265654aec4ba2abfa8878546d8928033a865e017b5e4500fe SHA512 895e925d66b9b740ef61909785d2c129b31ccbb6c85672414ef816cdd5b8a03a1579f8b276af84b2e06986f238b91460df540bc39d8bc3dcec920bf787fdfe52
 EBUILD fonttools-4.33.0.ebuild 1508 BLAKE2B cf5cf5a7b3fe8e4072306cfa26b7a88857d5ad42705053c0f2b19720dd0f3e8d2d62cc8f95aeba6265654aec4ba2abfa8878546d8928033a865e017b5e4500fe SHA512 895e925d66b9b740ef61909785d2c129b31ccbb6c85672414ef816cdd5b8a03a1579f8b276af84b2e06986f238b91460df540bc39d8bc3dcec920bf787fdfe52
 EBUILD fonttools-4.33.1.ebuild 1508 BLAKE2B cf5cf5a7b3fe8e4072306cfa26b7a88857d5ad42705053c0f2b19720dd0f3e8d2d62cc8f95aeba6265654aec4ba2abfa8878546d8928033a865e017b5e4500fe SHA512 895e925d66b9b740ef61909785d2c129b31ccbb6c85672414ef816cdd5b8a03a1579f8b276af84b2e06986f238b91460df540bc39d8bc3dcec920bf787fdfe52
 EBUILD fonttools-4.33.2.ebuild 1514 BLAKE2B 9db3544e230d5de25c1e4b8dd3601b6b9beaafbb50dc7ec866d429e5e29d4e8864cdde669d59cfde5d50cafd7327d99a44efaaf1bcd15f264cf48a62389102ed SHA512 a7119c478bec936b059733f5934f9da21227c6c9c592825adcbc951da0d84b6de8e9266cc1e8b034f8e5fc1ff8aa767a2ec3ec0fb1ada43cb7e3cc5cd4cb85aa
-EBUILD fonttools-4.33.3.ebuild 1514 BLAKE2B 9db3544e230d5de25c1e4b8dd3601b6b9beaafbb50dc7ec866d429e5e29d4e8864cdde669d59cfde5d50cafd7327d99a44efaaf1bcd15f264cf48a62389102ed SHA512 a7119c478bec936b059733f5934f9da21227c6c9c592825adcbc951da0d84b6de8e9266cc1e8b034f8e5fc1ff8aa767a2ec3ec0fb1ada43cb7e3cc5cd4cb85aa
+EBUILD fonttools-4.33.3.ebuild 1521 BLAKE2B 5c5dc77621aa82f3a8699c19b37d92ce38074191fb2653e4770e29c8984661553b02055e17e8af6ae38cfcb928f9902eb594a8e78eef42516e39d11a7e741381 SHA512 4d69e6cdcc37d68ec4d805d13ae4b2bbd207e388f63372b28c606721a8e1b444e8d2a46dad6963ec8e4acf0fddaf408f1d4bb2169cc882ef70428263e4a763e3
 MISC metadata.xml 372 BLAKE2B 950ec78bf127250847c6513c22a5108b251afdb000d361068edf9d00d64a5baf6925ba4058bb889724febb28d92abc044c29af5936a48d8e8951b12314b64357 SHA512 03e76e28959bab83fe41c3ee4b55692ced9b1360e73e38a6e8f6e5c06fd1185dcbe0214aea2edff18d248abf252c1877d0d2c2b78b8e088e606c09c34e93e7ac
diff --git a/dev-python/fonttools/fonttools-4.30.0.ebuild b/dev-python/fonttools/fonttools-4.30.0.ebuild
deleted file mode 100644
index 0ca22fe5ef4b..000000000000
--- a/dev-python/fonttools/fonttools-4.30.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} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
-HOMEPAGE="https://github.com/fonttools/fonttools/"
-SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		app-arch/brotli[python,${PYTHON_USEDEP}]
-		app-arch/zopfli
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# When dev-python/pytest-shutil is installed, we get weird import errors.
-	# This is due to incomplete nesting in the Tests/ tree:
-	#
-	#   Tests/feaLib/__init__.py
-	#   Tests/ufoLib/__init__.py
-	#   Tests/svgLib/path/__init__.py
-	#   Tests/otlLib/__init__.py
-	#   Tests/varLib/__init__.py
-	#
-	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
-	touch Tests/svgLib/__init__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	export FONTTOOLS_WITH_CYTHON=1
-}
-
-src_test() {
-	# virtualx used when matplotlib is installed causing plot module tests to run
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	epytest Tests fontTools || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/fonttools/fonttools-4.31.1.ebuild b/dev-python/fonttools/fonttools-4.31.1.ebuild
deleted file mode 100644
index f0532d0a8742..000000000000
--- a/dev-python/fonttools/fonttools-4.31.1.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} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
-HOMEPAGE="https://github.com/fonttools/fonttools/"
-SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-
-RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		app-arch/brotli[python,${PYTHON_USEDEP}]
-		app-arch/zopfli
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# When dev-python/pytest-shutil is installed, we get weird import errors.
-	# This is due to incomplete nesting in the Tests/ tree:
-	#
-	#   Tests/feaLib/__init__.py
-	#   Tests/ufoLib/__init__.py
-	#   Tests/svgLib/path/__init__.py
-	#   Tests/otlLib/__init__.py
-	#   Tests/varLib/__init__.py
-	#
-	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
-	touch Tests/svgLib/__init__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	export FONTTOOLS_WITH_CYTHON=1
-}
-
-src_test() {
-	# virtualx used when matplotlib is installed causing plot module tests to run
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	epytest Tests fontTools || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/fonttools/fonttools-4.31.2.ebuild b/dev-python/fonttools/fonttools-4.31.2.ebuild
index f8f86f0e053b..0ca22fe5ef4b 100644
--- a/dev-python/fonttools/fonttools-4.31.2.ebuild
+++ b/dev-python/fonttools/fonttools-4.31.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}
diff --git a/dev-python/fonttools/fonttools-4.33.3.ebuild b/dev-python/fonttools/fonttools-4.33.3.ebuild
index 1e5f5a109536..812261317d74 100644
--- a/dev-python/fonttools/fonttools-4.33.3.ebuild
+++ b/dev-python/fonttools/fonttools-4.33.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}
diff --git a/dev-python/fs/Manifest b/dev-python/fs/Manifest
index ad63ef27bfb2..6bbeb825adbc 100644
--- a/dev-python/fs/Manifest
+++ b/dev-python/fs/Manifest
@@ -1,5 +1,5 @@
 DIST fs-2.4.16.tar.gz 187441 BLAKE2B 5a59dd5bcaae19180a918ba0ceb99b598134d73e4c9ecad840b3cf3041613171367d878d147f045005a87636e8f2145451252d646dbffb8d0f3ae6ac254142ee SHA512 7d9a03b5a782cce048189a7ff527757e60ef6fbb99925713b0179dc9c483f63b54fb1911f39bf2230366c789c526a1b8927863ce93e13a0f71fd8734a7fdb9df
 DIST pyfilesystem2-2.4.15.tar.gz 181799 BLAKE2B 522d118dcee6aafe754d8eb571aa88f26cbbbafd7fedabbf7f4470e098dde01db42cb26b20ed28305daf8f32a22250da81c8a932d420ef4bdf825deb363a26a1 SHA512 7bb153dad5ea03eec7cb1af8d1b5a851845984e194f288687b0e737e1f32c74bf4c1a8d62a9105c8637cd5a29ab82810df9fc11055b894ab0df899cb20a4e1c1
 EBUILD fs-2.4.15.ebuild 1530 BLAKE2B 5fd1efa0be309ffdf72c582c1878d90f6c14bf4e1136cb210c1f1ea68139df9df9d834aeeba94c75bb9e057738c1fff880ac38f01d23cab830bb015882f49a91 SHA512 8ac60d1e7493f66a3d5694ead4835b19af02c8ad57b2d954272e8b98294f86bf3c9339fb13ce08a9626d84935c5cd8e329f1b8abbd968cbc8fc599f1c5dd6c02
-EBUILD fs-2.4.16.ebuild 1341 BLAKE2B f1077b86029c9ddfd57e32013f6232daa8291108bbbbe2ed1346e2d97f93b4297311001674a7e6b2a4790285d47b609c605ce81516f332b81d769e577e423fcd SHA512 d21c44cc3674c0b4cb070e8cc20831f93dee42295c67ffcd808448e6a734a55e9ce159aa8fa69c1ba9fc1b9f10b930c7d5b5e5b052f1284b382d6109a97a6b3c
+EBUILD fs-2.4.16.ebuild 1348 BLAKE2B 8281a0447a453ee7caf5b6fe0e2292f3e4d8193a49db99f3dc9a9c0c08fe555a84a91d036f2e390f57b7a5ea7bc26bae7f5d05df245b87ea7ef5fad70b465885 SHA512 fe765359b74892885f7fde111617714d4a4158f1a723d11cd1f23304037430b3aaf79371c5d44cecbb0324c496c6037de4b9a8aab86539376fa0241a255e0326
 MISC metadata.xml 581 BLAKE2B b3fa399e172b10606f13b3de4fb0afbe332e7234b3163ce198b30cea2d4c24967b0943d578085dfbaada503700f70015517d01e3f3a01ddcc4795e1821d1a5ce SHA512 3d3154db8e81f2764f99e2595a99a34061762a5cf16695926e25407859f20a59f4dbf60b0d8e18fb80d90c6342f70cc6a2c886841bf156ae06b17a670a4987c0
diff --git a/dev-python/fs/fs-2.4.16.ebuild b/dev-python/fs/fs-2.4.16.ebuild
index 3ed8643399b4..14eb402a18d9 100644
--- a/dev-python/fs/fs-2.4.16.ebuild
+++ b/dev-python/fs/fs-2.4.16.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 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
diff --git a/dev-python/gpep517/Manifest b/dev-python/gpep517/Manifest
index ba4f8e956978..2a51c6265b0e 100644
--- a/dev-python/gpep517/Manifest
+++ b/dev-python/gpep517/Manifest
@@ -1,5 +1,5 @@
 DIST gpep517-3.gh.tar.gz 7074 BLAKE2B 99a499ae13b6aac41e86d11735f0e49a5dc921881a1efa94bee19bfd779af6827707d05d6407ed15e4a3a6b518c8c0b3f50901e3b12df41081930f83b288e461 SHA512 90f756f5a1d783e9d402e098162a70b363a0a81e331e810e5c89c3302bb5839032603252bad1c98c176a7828b70adfac967e39ba455dcd3a20097e74923980c8
-DIST gpep517-4.gh.tar.gz 8950 BLAKE2B ce5d74ee8bda415f14959a8d35561034f99f2f6be373e8ac937cb95e1109878eec63d171236c45ad86ba41db847194bb846ed3226511c579bb156d112146b294 SHA512 74de4318a86fe4282ad6fff4dd9aedc491aced1df4705e62484160edc0c7d447b035cd0ee915a3766bcb3cede95c2ee4dc26064336a56f5763566c79d8b8156e
+DIST gpep517-5.gh.tar.gz 9568 BLAKE2B 7641ae7792a15be7241d9c02622b589a796a96c76894c29f37733e33820532042f6d5b8018ef021b487c299f3a28adf37949e96c38148d88c140ed6926e95f2b SHA512 3618f3d17cc367716c4813d75814ef295896f210ff32c13f1ef8ad8cde2120a30ba69705e14dbb1e5528bf5a348f9f8c5f5de8b416608cd496733e94afbeb2c6
 EBUILD gpep517-3.ebuild 1135 BLAKE2B 0ed1877164f202f4cf5822e03bee83449f0acabda3ae6956ba0a135ce4b81928dad7db98648495b8664f04201b952f1d45eb3ccfa210a658fbdae1ba8ca551bb SHA512 fc820987658684408bd842d42ea079938d49d4b81a5f7efd99074b7ce6277dd6231aa45b88cabb11f47c89d9c2b50534c66ff66b2cd576b145813f142ab24c8c
-EBUILD gpep517-4.ebuild 1143 BLAKE2B e192eac1721473cc68393494bed86db30bbb9e26cad3647309c6025127429cbbfe829f85cbfab50c3d2d06d9331fd3d3bfa30b7f665a99fb4b7ca7f9f6abfaab SHA512 eb96c30bbd22607735f39c4327b51783c5b6b5d4ec3f15e2fa348841ef27c3092b1ccd5d0e1bc0fb8612c637e5ff43f9d5f57241005c9ec6bdfd568a2c6c94da
+EBUILD gpep517-5.ebuild 1143 BLAKE2B e192eac1721473cc68393494bed86db30bbb9e26cad3647309c6025127429cbbfe829f85cbfab50c3d2d06d9331fd3d3bfa30b7f665a99fb4b7ca7f9f6abfaab SHA512 eb96c30bbd22607735f39c4327b51783c5b6b5d4ec3f15e2fa348841ef27c3092b1ccd5d0e1bc0fb8612c637e5ff43f9d5f57241005c9ec6bdfd568a2c6c94da
 MISC metadata.xml 396 BLAKE2B a3f6d1cea383a38b4b6e5f80d2306ca320a66c0d3b0131601ef6f0ea48483757b9123d74ba99fe972dde06a998c15290cbc4243285c240493ae0293d2f8e1141 SHA512 8c584869f2fc7a0947b9e5ffa330652d8b6e61a6a472fcddf0422f1719422fb8d477cdf17d87e6d0e9f6994d608a77202c24e531dd146b0f8d731a047f80d14e
diff --git a/dev-python/gpep517/gpep517-4.ebuild b/dev-python/gpep517/gpep517-5.ebuild
similarity index 100%
rename from dev-python/gpep517/gpep517-4.ebuild
rename to dev-python/gpep517/gpep517-5.ebuild
diff --git a/dev-python/ini2toml/Manifest b/dev-python/ini2toml/Manifest
index a5215596944f..de38f1df49bc 100644
--- a/dev-python/ini2toml/Manifest
+++ b/dev-python/ini2toml/Manifest
@@ -1,4 +1,4 @@
 AUX ini2toml-0.10-test.patch 1883 BLAKE2B 88402feed5aa7e51587f7297b8c3afa058d04e0f878acf1a6af5dfab77cb50d0c5708cfe9e1a45d704f7fbaca068cf9f3d0838bdcb6e1aa3145129f6239180c9 SHA512 1df613aa1e793716e4b0e7a83b3f15bb69f7abd5c43831e0d09dd4ec42ee8ed617586188bfb9bfc6863f93f4cdeb0114226e9da44c8b3a73b04705f7c9139c87
 DIST ini2toml-0.10.gh.tar.gz 93535 BLAKE2B 8d8a5b31c53b9194e578b473dfd562b1b569d701b36b267ec4f59ea75ec03abd6e1df5541327b9414a2f1c04b1cb41ec57c6f900007f69a3c51a172143d2eacd SHA512 3d88f97c50a13fe3878e3fa35d70c9051874bec99d278411dcc7098d86898deb0e490be26f293e9a304d4c9a2842274e68126a2d20dac77b526161fde682dd75
-EBUILD ini2toml-0.10.ebuild 1751 BLAKE2B b67499f66334a5f2d8331a843d94fe2ca58651dcd5b47321772fff62b4741141c07b165c8ac6e4441f8e5e19da508ba0303687344bc36801966d8d21dc5097f8 SHA512 df6deecfcf0ab3e7b0f0c0f42e38612e379b1b84ace778d4a255044576eab22f5cadf857edc6a860c79377b24f142d5a3ddbb62a3a94438d619d17d994ab46f8
+EBUILD ini2toml-0.10.ebuild 1750 BLAKE2B 0ee61719351915c3d7b2a74097834e0b744d51d222f0bb40bcb9f6939732278c47506a7035faf1c5e246098008326c8839bf615f902f06312cc45c9c3d646818 SHA512 dc7c4b66f30439c53f315de4e5ea44bfb7ce5e0ba4eb1be5e70aac484986809d492225db070aebfd44fb3395c8c74bab8085a31cd6477b15e865a40dffab599f
 MISC metadata.xml 374 BLAKE2B d1d096c2db4d1975e07553486be8e1ef66a63338b6a6617f71131565b80f612b9d50ca7c039d0b37b02eec56421231f52833390eb8536de44d4edd7c90d307f2 SHA512 21a272e9c3a7eb3e0950358f8ffb90b961ff0e39073519ed0b36660dfae91b24f8e09e3b89a20dbeadba45d995eea4bb89d484acc04a7251dfb9f33603bef998
diff --git a/dev-python/ini2toml/ini2toml-0.10.ebuild b/dev-python/ini2toml/ini2toml-0.10.ebuild
index be218d1857b8..bead9ab55150 100644
--- a/dev-python/ini2toml/ini2toml-0.10.ebuild
+++ b/dev-python/ini2toml/ini2toml-0.10.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MPL-2.0"
 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"
 
 RDEPEND="
 	>=dev-python/packaging-20.7[${PYTHON_USEDEP}]
diff --git a/dev-python/ioflo/Manifest b/dev-python/ioflo/Manifest
index e84f4a3fe343..375afbdd4e24 100644
--- a/dev-python/ioflo/Manifest
+++ b/dev-python/ioflo/Manifest
@@ -3,6 +3,5 @@ AUX ioflo-2.0.2-py310.patch 2520 BLAKE2B fbb1b8b5d1d2d135abb21f7f2ff094d4c85bf4d
 AUX ioflo-2.0.2-python39.patch 3813 BLAKE2B a21f5829b5a2fd4200350949d66d4fd77f5ba2b21d5fdb95c7754745fc2cf41f18640d4c79f5e1037fc0d4ca016c7dac062567aa8662b0e41e702e4dd0a94931 SHA512 b588703d653848401fb8e13be949f6de4ff41143eae669ccdcae8edaaac1883be0a684112dacfdf11fa3f2842dbde0dce2b47a7680cb87761d30ffa4018569e8
 AUX ioflo-2.0.2-tests.patch 1059 BLAKE2B a093cf0db0e00c4f06f0eeda76acee4515951e0dca1a77688e2cd4ccc33a3b10402228d76aa25f787cbfa8771d12f0613fe62e5fa38e09b6d8238870c2b25951 SHA512 5642963e6c29941c2803c6833d229b9fab62f60e7534fb6bfd7a101746eff1704dcfe3bdbbc72bfb466317562d995ede5a70a8ffc83ae9e76ab2d9c01bcab349
 DIST ioflo-2.0.2.tar.gz 837382 BLAKE2B 1fe878c8a9a47a9be5083e392e15256f1a566433b4341e2ee234e84332bb72af0c426d04c77ccace33cfb05664745caaa63e910913c3d63bbb2e5d8360a1ec90 SHA512 7485924ce329889afb1c3e0555b54fdbfb11eafce48fb0ac15bacd229fea512c44fcc118bbc4368ebc7c770d62129ee6b895b982f73a269de7131ea37daac02b
-EBUILD ioflo-2.0.2-r1.ebuild 963 BLAKE2B 9838b1c970433daeb79bb877f5ed72db9150249d0d5307a299ad969c35c880750d66fee3426dc4569c45afa3cca57bd51a49ddf77ee9dcf694af6f983272a7af SHA512 fb4eeb959d214349c17aa82c8c6a01e33c6f81a4d512c84c67e6d9d6de3f7ce590acaa70d00d1fbf6685c3a380972bd14aaf5c00430fab77c6d741e82f39ac6e
-EBUILD ioflo-2.0.2-r2.ebuild 966 BLAKE2B 02901c0d903956fd67f0a230b0130f48999f90ecd1e941fd2800f67a1ce7f0e220b8c9b4f14272b6f2529d5e9959df26f86c8549540a0417b712bdb4d4eabb5d SHA512 4de15ae1eeafc83c3f5417e6bc31bd4110ec24a7b9c94fee2936e4113f8304674ae7992a9362a3900f15db22c349c2219a5f545ca921522561f24c56a0fbf36b
+EBUILD ioflo-2.0.2-r2.ebuild 964 BLAKE2B a5f53f312da2bd99ad0847872d5d02185200078da15ce46418158d45eba8d6266c3b7d56202a913546bdbe52360338de94cf3bb7848a2fb929119cbb5247c5b8 SHA512 2a360b87845ba219aa7623d9ca04d680d993a79737a51222473f1d612688b6316207414ed886968d48a849dc6f235e4439439c6fd61324c878995eed63726f72
 MISC metadata.xml 494 BLAKE2B dc398c0ee508c0c1cf9ee17712efcbf7f994ed053416da6bdd236fe80402b80ce251272824bebbdcc7ea79cf98b6b5dd812de11fca55eb625bf19e5cf93228e3 SHA512 7364c6b7a37dd8ed762fc7d609e71ff93cd3321f6f94f88d795bd0a3082749571644cbdfd3c9d63a916249122fdfb47ff5377907159782ddf5744c5ea4a13f39
diff --git a/dev-python/ioflo/ioflo-2.0.2-r1.ebuild b/dev-python/ioflo/ioflo-2.0.2-r1.ebuild
deleted file mode 100644
index 483697a9d916..000000000000
--- a/dev-python/ioflo/ioflo-2.0.2-r1.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
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Automated Reasoning Engine and Flow Based Programming Framework"
-HOMEPAGE="https://github.com/ioflo/ioflo/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-
-RDEPEND="
-	$(python_gen_cond_dep '>=dev-lang/python-3.7.4' python3_7)
-"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest-salt-factories[${PYTHON_USEDEP}]
-		app-admin/salt[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/ioflo-1.7.8-network-test.patch"
-	"${FILESDIR}/ioflo-2.0.2-python39.patch"
-	"${FILESDIR}/ioflo-2.0.2-tests.patch"
-	"${FILESDIR}/ioflo-2.0.2-py310.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e 's:"setuptools_git[^"]*",::' -i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/ioflo/ioflo-2.0.2-r2.ebuild b/dev-python/ioflo/ioflo-2.0.2-r2.ebuild
index 1be90db904ae..729a90285f1f 100644
--- a/dev-python/ioflo/ioflo-2.0.2-r2.ebuild
+++ b/dev-python/ioflo/ioflo-2.0.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 2fc874d9e09a..b718c2fe7046 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -9,6 +9,6 @@ EBUILD ipython-7.31.1.ebuild 4651 BLAKE2B ebe9ec2ae2f606efb76fed9ca1e3e04c78a13c
 EBUILD ipython-8.0.1.ebuild 4503 BLAKE2B 1e152762209f46d4a20f8eaeda4cfe351ea0719131f667d03e5efde42eb18cf09128b6274b61afde42a4e2e88a35b6c0ae533dfa5053124d757d79aa8af4631d SHA512 1d42837b4e311c3e56e8be0ed0e076d1bf118cdbd4c5ef8038951629de21d5e7c4d1749fd3f7378c5080f3e9bd78d4a43c6cab087a5abbf8e0ee5ce9dda42e2f
 EBUILD ipython-8.1.0.ebuild 4522 BLAKE2B d260913823293f3314687bc8a9a9177c5de9543162e5c02b2331bc823b412335bd01435c349b7df2474a23a6abed79a17d40f98b69e125b6fa80e6dc80d56e91 SHA512 ba55f3888f8fa6b8d7a9052af96d01f1d9edac4d0cf4f969c5fc317e6321ecdb32b2f661b8c3bd6a3bd743e280e7bfad657f5c2d7c6b54befce8d92b0a0ddc3f
 EBUILD ipython-8.1.1.ebuild 4535 BLAKE2B 6c5613de80033d7a78fae46482b13f79abd65ab927774b682fe3da6afd02dca5e63dfd3e46962b72f1aabca936808eec43957daa031a3053bbd1ea92b289e30c SHA512 0acc5242b42bf9aef8e20fa2267ce6b1309077ec359f4a0cd2f3b18463dd21872ce3eb54468046d92317ce31d5d91bc654ddd97895503b27e6c14ecfdd430874
-EBUILD ipython-8.2.0.ebuild 4540 BLAKE2B 47468f04816eed86916a6f8abee4b6b7a015865a72ad53dbcaf5777585699ccc1c88e04eee1a6d3ca2dc1b3bc5148019d43fb371eefe769d11aa0d0f02db3086 SHA512 ef05b9916573a85bb2c991c51aa1d6f6d6f66299d4d8669eab976a8cbf702db250ad8caea95af27eb6302dce033b33b6b6eed17ab3266ce7252dd10dc5de4753
+EBUILD ipython-8.2.0.ebuild 4539 BLAKE2B e0ca84c5d6421368ec015568e886df4d76fa7f802822878f3c6a7677f219af1463f18c23e40bda95f0ee959fa6e2e11962e8223de292120ab7883a33812784f3 SHA512 bb7c1a4edc15c4f86fe89f76efb4cfc01c588a02d02008d2fd88b829294c1c327d96cbc73579a1211e4450fb2f59e29e4ff21b7a0f9bc6402243d96e8dd9e529
 EBUILD ipython-8.3.0-r1.ebuild 4523 BLAKE2B dcb8170a301665b744c2f3129bc8b9af89d09e554c7f6ebb8c21e2cd7a4c517ffbdc3b9b4564c1f2b2c9e5f7b3e8d72b925e3dad7bfee274c4ad5fd14ce750c3 SHA512 8b3877ba330461193508635467a9e958bb301de79c0f4ee281b4defcb0d63238c7d46465e6da09db53805062d3e65c2ff100c9b24dc38de54a235683c3719181
 MISC metadata.xml 2883 BLAKE2B f61d1c66cdc9a956f3fdc9fcbc93fbc2051e9d0872beb9229e87a8fdabbce656efee9702e66bf30bec68009702f42e4036202e02208a428a8ed87b448f625536 SHA512 617f19e859544079d2680e9796e3ff0b7af41577776847d4c4dccfffc460dfc887631169289e5271120f375bea7c7836395abb9bf8a7628b3b55a7c1beefda9b
diff --git a/dev-python/ipython/ipython-8.2.0.ebuild b/dev-python/ipython/ipython-8.2.0.ebuild
index 767e960bf670..9a6e7263bccd 100644
--- a/dev-python/ipython/ipython-8.2.0.ebuild
+++ b/dev-python/ipython/ipython-8.2.0.ebuild
@@ -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 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ~ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/kiwisolver/Manifest b/dev-python/kiwisolver/Manifest
index 4d3a790ff554..69ad431f3f3f 100644
--- a/dev-python/kiwisolver/Manifest
+++ b/dev-python/kiwisolver/Manifest
@@ -1,5 +1,3 @@
-DIST kiwi-1.4.1.tar.gz 91319 BLAKE2B ac8d9cf1e8960f436566e2ff8d589ff6707fc4458299bc33ff96387c36246d583e67ef84610b710b3d9364d8a4ae963577b4abfc3ddbfc18a417f956512479d9 SHA512 7178f26c96ebf4a173b563bc95d2a07a9f75b618fc953aa0d45a8c2719cf868e4409ad2c95280704ee593fc99d9e2c83b0628940b3571d1be712241464a9cd6d
 DIST kiwi-1.4.2.tar.gz 91150 BLAKE2B 8441d52267b3b436d9f05baabbd3beafc51d2f257fc982f1cf90b6296ccdbc24511de6b55b6201eb1df37ec9487282cc40142e9083cf4c1e925976a098927e1a SHA512 e7726ac7985bea1020fd3a26bf54b941acfffffb1f47b462c74f9829c5a89e7abd0732b5a11685b20d6a17ac9625178c68ea71052e852f91491a308d07111b01
-EBUILD kiwisolver-1.4.1.ebuild 770 BLAKE2B 09463f7386da6dfb25681859a438326b96dc3e7e23f26b66251f4ecd9d2e2c7e9a11b77d2772772b0e9be2d621a62fb6325a1befc17029bac1bcb0e46f1cd848 SHA512 3fb4d382b307303dcc44a4d5d14c70853e64373a6fab0721c23fa078fc97b109edf7e34f59809f5878245e7a0b0817a21bedc488e89575998406d75463378798
-EBUILD kiwisolver-1.4.2.ebuild 826 BLAKE2B d7ac505e34d5b17ab3183a063ab596cbd0964bbe64bbd70de54c640daec165d19b3f6e5f06f3f9d3555473035ea913f45ada9ce125a6aece326ec0515cc1dafc SHA512 fb466faefa24af761684b93b2d50ff9cd079c9acb4e4266e6330e3bea3ceb15915a3f70df46429d3278565103b9f6f194ed6ecd742a8297188bdba01c6be1540
+EBUILD kiwisolver-1.4.2.ebuild 825 BLAKE2B 9896b9ae28d62014d98f1f150a56721fce23284b3b2f344222f49ce293d96d6566adad2767affb5b3b6a5ca26aa659ba10ab8d50de943ecc3ab6be54af707b65 SHA512 10f7dfc28226bcde9bf10c28bc09bec3b52d9495ba9b83ccac1caa5bd9e82d5dfa2b05b2566054e540fd08acd1025aa06ec1728714c335db3f22f053a2abcaef
 MISC metadata.xml 366 BLAKE2B d724248e9950219de4990e67822a16781e1a28f41d863fde04b3e1212b982a86819636a621b6e23089b76042ebbb23e0944a88ef9ab4c4abe62103f12197e5c2 SHA512 526fe3a81426edfc4c050631133799d948d1becb016319e954491090b9f3f6d410958db7027b5c2e2386b40c783f8c984b2588cda56e3ac58f3d2b1a5a8af0f0
diff --git a/dev-python/kiwisolver/kiwisolver-1.4.1.ebuild b/dev-python/kiwisolver/kiwisolver-1.4.1.ebuild
deleted file mode 100644
index a8e6fd19ec74..000000000000
--- a/dev-python/kiwisolver/kiwisolver-1.4.1.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} )
-
-inherit distutils-r1
-
-MY_P=kiwi-${PV}
-DESCRIPTION="An efficient C++ implementation of the Cassowary constraint solving algorithm"
-HOMEPAGE="https://github.com/nucleic/kiwi/"
-SRC_URI="
-	https://github.com/nucleic/kiwi/archive/${PV}.tar.gz -> ${MY_P}.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Clear-BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/cppy-1.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-3.4.3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/kiwisolver/kiwisolver-1.4.2.ebuild b/dev-python/kiwisolver/kiwisolver-1.4.2.ebuild
index 055af1325d09..4af89d268f08 100644
--- a/dev-python/kiwisolver/kiwisolver-1.4.2.ebuild
+++ b/dev-python/kiwisolver/kiwisolver-1.4.2.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Clear-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 ppc ppc64 ~riscv ~s390 sparc x86"
 
 COMMON_DEPEND="
 	>=dev-python/cppy-1.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/nspektr/Manifest b/dev-python/nspektr/Manifest
index f8fb606e64e7..f3c53322a40f 100644
--- a/dev-python/nspektr/Manifest
+++ b/dev-python/nspektr/Manifest
@@ -1,3 +1,3 @@
 DIST nspektr-0.3.0.tar.gz 6314 BLAKE2B cb7b9b5b35a455d4e72e78d93db49b4f8e274c7d7a6c8bf7ccca52cce2598a937d31b76f1a30c4aa6d673e4ce52c4645ce7392965df35b0888d1c69226e08f00 SHA512 6fc22ad7858858f3b956ba5918ca92468f13d4b7db0e4861b836e63153f7e4319c6468e4f73969ce3fb7845ca8d97808b9db2eb2705a47fe1a8c4c19b9c2ef33
-EBUILD nspektr-0.3.0.ebuild 1661 BLAKE2B 69e988b764bc7d5ed8a6e865926d7beb5b840b03be0cc8e6fd75747789f8f7909af579cf331ab3700adb17184c094546827617f39a5156c72251a41a416649d5 SHA512 185146accda2790e5e26e69cfd235f5d860d260d9d794708796de970ff085cff632da6ae7464c462f48383a7bde64fe04163f16c27756911b9ffe130496d855f
+EBUILD nspektr-0.3.0.ebuild 1660 BLAKE2B cd9fde11233c94e4604ec05061b76713c96fafbd626cbdae2a0880fd84882839df907234b18e68c87cc76eb089fa64c58a856a8954bdf367e1116e8ac86ad8e3 SHA512 f8971f84186d74bfc6981b4c354ad152b196323a78da05e38610b5ec4d60adf49e65f2d87296551dc2c7cad82ff491f7e3e56849952a5e093dab4faf27b9db89
 MISC metadata.xml 343 BLAKE2B c5ec4b6c1f41692875fcb9a93dea4c0f253339788b94fd667709898e2cc49470f113258137093fd29986ed8fbadf2ea64f95319c51568f12259b8869558bfdab SHA512 da052d5ee619430fbfc021b9eb8d3967dc4d6ca3ce0bc5c9b1badb067d7c0babe12abde3fbc9c4710bc6a0cf081e6bc445504b852ec714f819781e1c4780779a
diff --git a/dev-python/nspektr/nspektr-0.3.0.ebuild b/dev-python/nspektr/nspektr-0.3.0.ebuild
index b78805c81cd5..77c24e02b71d 100644
--- a/dev-python/nspektr/nspektr-0.3.0.ebuild
+++ b/dev-python/nspektr/nspektr-0.3.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-python/jaraco-context-4.1.1-r2[${PYTHON_USEDEP}]
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index fc18e845fce6..a847789bea3e 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -4,7 +4,7 @@ DIST pylint-2.13.5.gh.tar.gz 1118551 BLAKE2B 70ee4254aa140aba16adfe67aeb896d9c45
 DIST pylint-2.13.7.gh.tar.gz 1120083 BLAKE2B c45d6ec65c11d3682bf3279969f3e45b827b2bbcebbfeb05a31df3a93bb943bf9643a5d467c1e2eebf717577032571a48db1ce84e1c81d72000808ec302aaf1b SHA512 ec0b2ef565239ab3e577c5c2d22c1c8df8b8bb0858c34b6606f649484d69a25c1f51ca61a3da66833d9a713e8a686dc32b940e574650577bdcc4e13d76acc2e5
 DIST pylint-2.13.8.gh.tar.gz 1121081 BLAKE2B 06a0a5c3801318ca45073f04a631e0617b5803ce01fd3973fc96d350c38a988222d4b8b03f86c12c317f6f87db5b7b85d1c428373a17e51d1044b382a0d03c1d SHA512 8ab01a15da7d9b659aa11de3ee804e0ad54fefd549be468fe194f8ec66640f5ecbdeddec468c9fd76d1eea8006d60249b1abba59d5047774d22b7b461224695d
 EBUILD pylint-2.12.2.ebuild 1724 BLAKE2B 289f62e0ad940e80b8b7de06a9ee52d043d4e2f6f16d99fd17f0d97dae0cac9687d960688a622db8159daae22e579c21bdee56c24acd40685a43446a365de22f SHA512 9798ca63f8d988f1a2818e36f059e644372d9a6c8d60dcc34e3042dd8360da75d2b8bfcedbc4b69e9a079b077885595586dc6ddfb41345fb5165847f15655df0
-EBUILD pylint-2.13.5.ebuild 2196 BLAKE2B cc8572b4f8d2c1152527ee6370bf265b6ba2b05d3169e31929f0ef3791f9d62750646e2864ea4d9bc0d9a729b8ab261d47035e16172c004ff35c6628c7f7fa24 SHA512 7e99996a898c3b50f0523872934fa791de53dcd5c537fce8f08a9b9b887049bd85b3a0efdbafb050e4b3e44f92c77dbadfcd206e465999ab3d4cbaf92e78a749
+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
 MISC metadata.xml 1100 BLAKE2B 97ec6bd2f6cf487afb93136e9ee58d0d5f8ad37e2ded456ed4f196e73fd37cddead2462d3592b44ca1a6c3722b1f194905238299f0c066945d1e22bdb18acc9b SHA512 0418d987879446fd76fe9b7fc4ee8b1c3c0d9bbab1d1fc3eb66eada0bc52f6b6480cf9852dc3a18b1915d2093642b9c87f24207e89b34d3e48c29a282a3ba979
diff --git a/dev-python/pylint/pylint-2.13.5.ebuild b/dev-python/pylint/pylint-2.13.5.ebuild
index 6c8bf9dba248..3589b92787e3 100644
--- a/dev-python/pylint/pylint-2.13.5.ebuild
+++ b/dev-python/pylint/pylint-2.13.5.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k 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/pytesseract/Manifest b/dev-python/pytesseract/Manifest
index f89347d9c9f9..7fb9b0a971ef 100644
--- a/dev-python/pytesseract/Manifest
+++ b/dev-python/pytesseract/Manifest
@@ -1,3 +1,3 @@
 DIST pytesseract-0.3.10.tar.gz 1098547 BLAKE2B d89f9082d8c7236b97bb96441809a19f494aacd23d4c02d5b7fb1b742616e7b26c249d49fceecc4f652792cdc3d7f2a79cd580a3360157f81205ff04d65afb10 SHA512 de77f0497c2bf60c1febf439ed13f0a8978aa23df76aadb789f8151177b73f45229799bd6b236aa7356a5145064f892e5b528a2d5a396849348f5b22f4343e16
-EBUILD pytesseract-0.3.10.ebuild 646 BLAKE2B ba1e1afaf8da7bf83dbf1b3cd07ceb624cf64acd5c7eb7de15514b68ab884806ee1ce8ba1edae7d6948af89ebaa6d2a0aa962aa0fb39f36f1b9a321997b2f3a7 SHA512 bb47f2e0d42c44f6f63634f4268a0d754e490af0afb58e6d2365864062d2ae6821590d13994f8fc3c857fb7d845773d840f5b2859588c28a76e11d2f8815c70d
+EBUILD pytesseract-0.3.10.ebuild 693 BLAKE2B f161c38a7991ea86b3b558eee512621c86d04280b0a3b068e1ae1db98901d167b9ddc738504994bd989588cbfa3c761cfa1c6b0f60110dbd94beef4ebc761bb7 SHA512 8569dbceaae585d5ee80da753de4bbbc4145b5ef29d280145688ab9296e11e2c683c1571075f437d5d0cf4d3c91ada4f271fd81948373ee477123d24d48b3121
 MISC metadata.xml 928 BLAKE2B 69397ac26f64a9c741e906d4ff1f105319cd5baa00ca5bebac019f2f2d0e2f55f6ddb4e55e54f068da58663cef00923b423aa13a460d21c5701d088a97f7b52b SHA512 d566881fe46eae8c9d86bcca464f718db30f7bda710d58acc6563920d07cdeb3be727980dcf1611b3653c9c8ca0b60fb01584efbf84c4b9f9e0287d8db760bc8
diff --git a/dev-python/pytesseract/pytesseract-0.3.10.ebuild b/dev-python/pytesseract/pytesseract-0.3.10.ebuild
index b14b6b1539fe..4fa1103fcf5a 100644
--- a/dev-python/pytesseract/pytesseract-0.3.10.ebuild
+++ b/dev-python/pytesseract/pytesseract-0.3.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Optical character recognition (OCR) tool"
@@ -17,13 +17,14 @@ KEYWORDS="~amd64"
 
 DEPEND=""
 RDEPEND="${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]
 	app-text/tesseract"
 BDEPEND="
 	test? (
 		app-text/tesseract[jpeg,png,tiff,webp]
 		media-libs/leptonica[gif,jpeg2k]
 		app-text/tessdata_fast[l10n_fr]
-		dev-python/pillow
+		dev-python/pillow[jpeg,zlib]
 	)
 "
 
diff --git a/dev-python/pytest-salt-factories/Manifest b/dev-python/pytest-salt-factories/Manifest
index 99ff60af3134..1a3e1f3754d7 100644
--- a/dev-python/pytest-salt-factories/Manifest
+++ b/dev-python/pytest-salt-factories/Manifest
@@ -3,5 +3,5 @@ AUX pytest-salt-factories-1.0.0_rc13-tests.patch 16967 BLAKE2B 804b5e2ce678e732f
 DIST pytest-salt-factories-0.121.1.tar.gz 102121 BLAKE2B 92cd5953b11377f1646f01b86a677a50216d16bcb944235a3f04176aecbb005974c415adcbf23cc391aab41b1ee9596984516ab61ecdd8c944d4ce707c39ab00 SHA512 32252695c6e8b17ef17d3330c4b0b38bdce89201d5573b4efa3531a72e826ee1fb26fea3ad0408401dec867cee405f21031804c32eb8fe6ceaa00925b17725a1
 DIST pytest-salt-factories-1.0.0_rc13.tar.gz 148418 BLAKE2B 3688f05d137df23266ebc7e999bc3b3a8ec198173b38dc98bd4a1e2655b982a37485278691e970da0be700cee6f609c57933b041a6d8403e75fb197f5d23d5d4 SHA512 f3713410704540ee48b7263973d3a9bf3159fb63e53e5ef5002201aea3fdcf0b4eaf00e1dd1e67d869b42242985d8117a117568d63abf5ad366e247fb3e1d83f
 EBUILD pytest-salt-factories-0.121.1-r1.ebuild 1724 BLAKE2B 83786447369717e7f414a154abf586dd1c87581f5809ba313ed954767f65ffb176b31c2e7d50523524619a703b601f8643c0134e0b564a2bbfa97d99a51ecc82 SHA512 889d5bfba0d62b48a9fef8327f11f31f7683d6d9107e9b9b537fa51eea66b7aa37f598da10f1836f68c95ad86eedda0ed5c0649aefde063cfa38b8402776fd23
-EBUILD pytest-salt-factories-1.0.0_rc13.ebuild 1999 BLAKE2B 3e31f5387edd8a85a4ffde4513382b337265c785728d799c11f67b58ba2028be9be78b5898bb077a65c99ad0fa9b9ebfd0dbb58ed53e504efbcdf17da96a3bc6 SHA512 631ec2fbfa826fcf2cf28eb2f45a0a5df6ac8ab3041463c304629f0d1e640021b4c6b2364578ef4a0546b09aef012adfb0ff7bb2545b528e635f46be6d5d3465
+EBUILD pytest-salt-factories-1.0.0_rc13.ebuild 1997 BLAKE2B be3bd42015780b72b1374093680fe96798e669fe9382a7c430a495db833296a72ac70ebce4eb4f742d382cded51f7ef644a1c01887bb058498b525c83ea3de8f SHA512 24e052ba39d700ce8aa352f19f28728dad2a0bbaa17e8db633f656df76a19f20145b4dd966450907f560dc6321cbbf6d06b0c005a1539d0472ba00a462029c40
 MISC metadata.xml 358 BLAKE2B 0ca310e1a7269e532dfe3610bf5c9a1d93ff8dcc46ee3f26322cfb0ba1fb572b521359547f49b0deb3f463efd0321e3b3bee0403878df676e3c54dbcac14753a SHA512 8eaf37e98efe76ff401c536368d1537255d09db93b4f84254b7eb291b603f6ee83d80a65e9529c7bcea8324baaff708dc12f97662dd87c57fece36a1d5d8e1c9
diff --git a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc13.ebuild b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc13.ebuild
index 5b63d09d34a1..9e4d5fa4bb0c 100644
--- a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc13.ebuild
+++ b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc13.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-${PV//_/}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-shell-utilities/Manifest b/dev-python/pytest-shell-utilities/Manifest
index e2acbcac36e8..25014fa7d801 100644
--- a/dev-python/pytest-shell-utilities/Manifest
+++ b/dev-python/pytest-shell-utilities/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-shell-utilities-1.0.5.tar.gz 89489 BLAKE2B 9cd7f95c9c1691e19c320378d1c2a4e147cb6fdc35ec6f3c80dc288e70416fce67b60ac86427f1ad322b2c17de3cd762e483d63076fa291b4b7d22d7a29c9e45 SHA512 395107af9eaa13ef39d01858e1674b6dedddc2cf93b9aba61316fd8d847031e1b535cc3bf4f2899dbc7828609b7d45b500aad29bb47668be6e0453ac099e99e4
-EBUILD pytest-shell-utilities-1.0.5.ebuild 1309 BLAKE2B b9959d6f0dd5def514c3cf3036f1ed2b7924ef8ef437bc8c2d736dd44a18e0ed4675624c0affb56d474f3429e2012db41b7caa4311e31f486b4c1b1c498d92da SHA512 f61cbf8dc61c9963dafd3bd8dc3e32f83089e9887a54c177d8200b38fc1ce43f11092ffe494024fee785353a212cef28bbe13bb12b53056911d2e8ec2ef91914
+EBUILD pytest-shell-utilities-1.0.5.ebuild 1307 BLAKE2B 08fcdd6d7166344c3ce8371b97f4ecdf784b971b927d073d0f3b30f80880664345f0028691017ec54513471aae70c3a1d242cf783e655eefccaaaf8038d65a87 SHA512 94386a1e4cf9dd2fa906191fbc636a53a0311ea76e76a0a2482d1bb2850ff49f7b98d94ba491d5d31f35f1d374445fb7fee0d0500247d1359b4c1a0130a6ebb2
 MISC metadata.xml 335 BLAKE2B 62e842ec4ec614a557cbe0360488a306fafb8db8c858615403965bbfa7766ee9388f4786c027b303e9e550b7104a3b600d678239feba18a66d77d46a51e2d33b SHA512 62b9164ddb9f3e2c9d3869027bf116bccdf3ec05f35ec6e8094fd4ab79d1ee5c142c810b2c47dc281e23b4aa0c1dfa8f48573d97ae7f45e001dbc0288203b1da
diff --git a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.0.5.ebuild b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.0.5.ebuild
index 251eaaa966d4..e28b54adeec0 100644
--- a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.0.5.ebuild
+++ b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.0.5.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 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 a68f1a70d45d..c0c736709e00 100644
--- a/dev-python/pytest-skip-markers/Manifest
+++ b/dev-python/pytest-skip-markers/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-skip-markers-1.2.0.tar.gz 79343 BLAKE2B 7f24b454fe19210d9ecadf10317a5a32830d722b64adbaf0fa6fad70a4c0cb598fa93b782a2b0f71bd23c4f91f2007d21383b488d725f61519d064e98ddd48f8 SHA512 76c1d0f0af7f7a56fa95d33bd5cb078792df3f054714d2ca1baa6d861e9404e2ec734a88a0768985388b1226c399ee6b54fe082ef7fcce6fc190fcae6201a416
-EBUILD pytest-skip-markers-1.2.0.ebuild 1582 BLAKE2B de47c5013802c2fe85f83064b7aba0eda9de317fc2ac1b71760fd70fc4b660fc80f4801a9de134adebf1e9d5bd1c2f7b3022da6eed5e172bdc0906462ba62758 SHA512 7582ae686b45bdd9e6319e0d9e5044cf4965c49ce5d11eeb43f19a25d3a4f7bb29eff711c80b37864affec4cecd6d18eb4e6fdb542a5192b9a5ecf55d96a6a99
+EBUILD pytest-skip-markers-1.2.0.ebuild 1580 BLAKE2B 70ba4fe95d5b71e17b685f45bd8127b6582346b8b23d20381dac9ad3052b407b1b1117cd57e81a0dd37df39b898520b93a7f1ff53efbeb8b72f6a0cd8b8859c3 SHA512 c8457d502fb0e48a5fe24c8d7749559e2c9a67990080144eeda26cbef27abb1e9059463ed3b341995fe0f4250a49073d519f8baef9fc876dd6790757fd2b7d1f
 MISC metadata.xml 332 BLAKE2B 444e088c986bc7bcfa6ede30c807c1ada0a8c3dba264ebea0469df16858c0adae29bf5dfdc0ca6b1039ee02d092f6470156b161c88bb9f2bb03989f4ff117855 SHA512 b4251ca80a18902ed8be25eca4830de8fb9ce23bee47b013a992c1250a84788ccf82e5c6029d655884f71ff78feb1915482c9405882657f0b99846df01c174a8
diff --git a/dev-python/pytest-skip-markers/pytest-skip-markers-1.2.0.ebuild b/dev-python/pytest-skip-markers/pytest-skip-markers-1.2.0.ebuild
index 143d362f6317..0fdd92751034 100644
--- a/dev-python/pytest-skip-markers/pytest-skip-markers-1.2.0.ebuild
+++ b/dev-python/pytest-skip-markers/pytest-skip-markers-1.2.0.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 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 7cba74a9adfa..92e9c3b01329 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 1282 BLAKE2B 1648868b4992a6b2d0b507ae1c3650e4710ec481e4daee8f1c5dae82a9a726e9c628393a24c0c722b3b5a6584822633e9286684e305746461651dc70187a452b SHA512 543d2cd2585cdcf73c620fb1c780d7aad7a094b1f0e72de8679a95b5855808e6ac50405034e016ca6ffeefad932097653aca9b55d319c8edb11538ac2c3ecbcb
+EBUILD pytest-system-statistics-1.0.2.ebuild 1280 BLAKE2B 84625cce9af9867e86b35b8511da868e8564ac1edc5d2a4ab6b20c368522590d7cfedd8a5500861886c9540abdb9db3b67dcb73e63a781cefc1ee2f9f5af9601 SHA512 2421d59b76373e3f822275b7ccdf5d42165c59d9f34f29dd5630335235dc0b2b3be0e1b633ea490386a929304207a0588675f017d9936d07ea00953d1f30e66b
 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 6c442fffd9b3..cbef3f0ce756 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 x86"
 
 RDEPEND="
 	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pythondialog/Manifest b/dev-python/pythondialog/Manifest
index 4c3fcde3aff3..c97d6f1d5d37 100644
--- a/dev-python/pythondialog/Manifest
+++ b/dev-python/pythondialog/Manifest
@@ -1,5 +1,3 @@
-DIST python3-pythondialog-3.5.1.tar.bz2 1418034 BLAKE2B 28dbb76a213d702abd6fb4571ddd28acea0bd9757424e99432aa58c1336fce2aa9b248e4de0631fe34c7ac52b928c8b3dc65afc42a826cc268ca4247be4dafb8 SHA512 f032e425ce1ebac53ade1401e48625b5869497367f788831d08fd22eb3b3b14fa5aebd26fd3681b47222ef0247ebb5c1ead127f111ca296197e258650dd675ad
 DIST python3-pythondialog-3.5.3.tar.bz2 1428518 BLAKE2B 032735d2df318b4e94c138475148c71ab8322c52181550ea13ddd27ac63d715cb59124a2fc1f09f7d835d4453583c449c665f5efd16a2418fe3ca3348f53ed8e SHA512 69ae3e3894dbd56136989699fee7a7f459ce9a024e0e06d22193f5fd306f0f2bf2f4d300460f7de7898db347acdf6111652878948a78468a1aa23158c5f7ae98
-EBUILD pythondialog-3.5.1.ebuild 732 BLAKE2B 8b7bbf72082e9d2f771e5bad198e36200dcd7304e68acbdaaaba13b029703b48e24e4ecbf7f67a2c49286b93d543686f9aeac630679cc5c1b5a41948a1a56e52 SHA512 e98bc26387aacf553f07319696a93db711e146671c062bfd28478c1d32fd7860cb691f609ec19a26cca00a9ec42096885be7741c2d515667fc943f69b53c2f02
-EBUILD pythondialog-3.5.3.ebuild 791 BLAKE2B 96730d99da40e2473926c223b02b792129f3da9094869c577ba7c8f380f4054c282a54702f62001491d089a58b3c263074a44f3390423d3007ce470feb5a0fc8 SHA512 20db568898efefad824be2ea5fbc4716f809b2e7fa3ceb676c1bce578367794487420d8467355b93aeae13224b840c1469f3f4feb237941fbc11d42573a56ba8
+EBUILD pythondialog-3.5.3.ebuild 789 BLAKE2B 1d95b8dd58dff106ad671dcd948080e0a1c96adb6f7b1cf6f255a039380228e937f06ed5727d77d27851b7628dcf4155a084dfe5c8e77e61b4945c0fb3e53fbf SHA512 d9f3805013d92c313ab51a3d91f3253fa265dbf42d2850f5efde19e4d0bdadd0d14be13a5b02493f6ef859ea680c0eea09c440e361cf06d7ad06ba115fea6b0c
 MISC metadata.xml 507 BLAKE2B 000faacd874d118fffc98e576774e75db2a00a0f9a3dff71d0e6676d5ed887c9e3020f9cc5949263d1a2e3344ade0cbca5a79055031428917a8f71e184c66d23 SHA512 a798ca22c3869f0dbbc402fde4eb0b82ef7a794a47b91f3540bb1edce78f5618d7cdcc69bc62f9fcbda24a0e301e68457fa88d028bf348d06edbef517e72ec24
diff --git a/dev-python/pythondialog/pythondialog-3.5.1.ebuild b/dev-python/pythondialog/pythondialog-3.5.1.ebuild
deleted file mode 100644
index e0351dc83d4a..000000000000
--- a/dev-python/pythondialog/pythondialog-3.5.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python module for making simple text/console-mode user interfaces"
-HOMEPAGE="http://pythondialog.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pythondialog/${PV}/python3-${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc sparc x86"
-
-RDEPEND="dev-util/dialog"
-
-distutils_enable_sphinx doc
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -e "/^    'sphinx.ext.intersphinx',/d" -i doc/conf.py || die
-}
-
-python_install_all() {
-	dodoc -r examples
-	docompress -x /usr/share/doc/${PF}/examples
-	default
-}
diff --git a/dev-python/pythondialog/pythondialog-3.5.3.ebuild b/dev-python/pythondialog/pythondialog-3.5.3.ebuild
index 739abccb308d..9290790fc6ff 100644
--- a/dev-python/pythondialog/pythondialog-3.5.3.ebuild
+++ b/dev-python/pythondialog/pythondialog-3.5.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/pythondialog/${PV}/python3-${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc sparc x86"
 
 RDEPEND="dev-util/dialog"
 
diff --git a/dev-python/raet/Manifest b/dev-python/raet/Manifest
index da06ac4dee76..657514d4ba80 100644
--- a/dev-python/raet/Manifest
+++ b/dev-python/raet/Manifest
@@ -1,6 +1,5 @@
 AUX raet-0.6.8-msgpack-1.0.patch 8061 BLAKE2B 90607848542b8ba5a219a872f6f4f4e12546ebf12e1d38cfc3c3259282eda97a641fcfa587646e83ffa5e98d5cc3b0e77c032ebf2358a5cd603e2ac58ad9a114 SHA512 524e2c787386a885796a3666dff792d7e2808585658227acbab51c90c7ebfdfb0435ea67bcdc23e9be6b43364452e23a085d4843e4c1ee1dd576e140007c4293
 AUX raet-0.6.8-py310.patch 1893 BLAKE2B 26dfeb901c64aa8b0c8a63f8be4e02ce65a99eea5e2f81d15be9eacb686a0d13bfe2e41588ed214a78906db2e607e1468f8c477a1c5dbe67cdf7cfae2d16da6a SHA512 d15618790b20e4843ed04a1ffe17acd3b31cf51388a9764c0f8ee33a28d503345dddea8da93418c6b46291ca61e4faf6fe3351935365909d1cfde5fc18d43f6d
 DIST raet-0.6.8.tar.gz 807419 BLAKE2B 2370eb55b76a52cf89363f9891a411ea7fa2f27b84bd216c44010fd9afb5dcd9261570f916db00ff7bd922c485cd6123b3a6522154b6e05f7869d7e790177f7b SHA512 01279e7414ec3edc9f2bc0641cb9e0606ebf5700b5ce37a05fd5919f3274b3b43aad64110baf4c4b1fda3843cb1a87b6be4ab592a8f62e82b3a716a86ae61b20
-EBUILD raet-0.6.8-r3.ebuild 990 BLAKE2B 5f814796ebeaac37661648964eb6110509d9548859a9d47aa9f248e1c887b6125ec4847b25f7ef04560178bc43517434c57efe24748910c1353bf741d4237fc8 SHA512 de32ce5d3c5615f460b01201a51669f1b039fca99b3683239054a9ca126a2d0cf33b32eb69491b62d3f236fb411db3a2a6fcd49326e3f9090ba4ccf57e7df6ea
-EBUILD raet-0.6.8-r4.ebuild 993 BLAKE2B 6e3c8ecb739982e310218be3393d2e5a4ea6ff25f09e53fca298e3d60f3eae9e1a0ce0c16d693f7a34e357037c394fa3472f0703c4feb5a4e35ac9b7a6c19d82 SHA512 baaec70157750bde5419b958f637cfb7d23c00b01b91add44f8dfa3c406fe05af365b9d93b4390a47d00c1b9cdf99751f36dbbbe921d744a7d1a437d739e7d10
+EBUILD raet-0.6.8-r4.ebuild 991 BLAKE2B dbdd04ec23a4910387483528e604a806728193e69222e0e2a7a712bb43c945dd9aef200f430cad9acf7edb61c268b4df94239856273755d1afb04b3aee8f1f24 SHA512 1efdc85618a5daea5104ea914c6ecc127d2797ed3a543b276b70a890d25c1359f7f3d73bb8a1cfb8a3ef399bd50fde7c70b9682a9136eb2c70e2ee4355712bab
 MISC metadata.xml 475 BLAKE2B a717b6ad3a8b2cdd4b4c48c6fae1226e92080952af627757ac935a6bc8beb3fbf941d6aa0c631281cedadfba5d10d95d6a9b5c8e4a3a47c8da800a7e89fbf8ca SHA512 605d31af6fa66007c18033eea24b7de74b8529996d9a9a19e9e188fd83831f83c5d621aff03e423d25388fca790970de9add12a10ce300aa90bbe08226f6a8e7
diff --git a/dev-python/raet/raet-0.6.8-r3.ebuild b/dev-python/raet/raet-0.6.8-r3.ebuild
deleted file mode 100644
index e70391368374..000000000000
--- a/dev-python/raet/raet-0.6.8-r3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Reliable Asynchronous Event Transport Protocol"
-HOMEPAGE="https://github.com/RaetProtocol/raet"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-	>=dev-python/libnacl-1.4.3[${PYTHON_USEDEP}]
-	>=dev-python/ioflo-2.0[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (
-		>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/raet-0.6.8-msgpack-1.0.patch"
-	"${FILESDIR}/raet-0.6.8-py310.patch"
-)
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -e "/setuptools_git/d" -i setup.py || die
-}
-
-python_test() {
-	pushd "${BUILD_DIR}"/lib || die
-	${EPYTHON} ${PN}/test/__init__.py || die "tests failed for ${EPYTHON}"
-	popd || die
-}
diff --git a/dev-python/raet/raet-0.6.8-r4.ebuild b/dev-python/raet/raet-0.6.8-r4.ebuild
index 64ca1883724f..279712894829 100644
--- a/dev-python/raet/raet-0.6.8-r4.ebuild
+++ b/dev-python/raet/raet-0.6.8-r4.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 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/setuptools-declarative-requirements/Manifest b/dev-python/setuptools-declarative-requirements/Manifest
index 7288231db5d5..0d44eff36eb8 100644
--- a/dev-python/setuptools-declarative-requirements/Manifest
+++ b/dev-python/setuptools-declarative-requirements/Manifest
@@ -1,3 +1,3 @@
 DIST setuptools-declarative-requirements-1.2.0.tar.gz 17936 BLAKE2B a5be2b64fc22d5a45136ec2b98c1d4cc6c20e17dc81070d12948b6f536a517ec8a660c105dfc13a4319d1de54409fb4f7a4c6bacaf1291afa13c7ecc27fd933f SHA512 ce0eeb8692ff2ea80db91cad981853da74c0ca80f58b698753de92f6df3ef5e1c158e314d0ac4d0b4fa99a2ad8ee2d7d80a9d1a13f334966c948dee1a0ae3d98
-EBUILD setuptools-declarative-requirements-1.2.0-r1.ebuild 1265 BLAKE2B 02799ad68e564f0b02b509034f84ded110ff328081a71a6e6cd40d70bf274d5f3d8f6300a82ecbed03934ca165f12a16839fdd5e9129f53e20709be80ddc1578 SHA512 bfd916a05d4d08c29ce37a2c8c9ead08bd0d2790234537be7c28e1b7c55ce3f88008fce6efcc969f3ea1d647ddf431c4da51f7fe5ee8914561200ac8a8eb7e93
+EBUILD setuptools-declarative-requirements-1.2.0-r1.ebuild 1263 BLAKE2B 645eb85f4c189bcb08eaf1f00c61f80d3fdc07078b1ea40df8b5fcc64df626746601d2d2f7f2ca0394a490a3f77f32e377f0a1f1dc4e3a96ecaa4773b40b0e68 SHA512 ee6fb04d41a723cf9cb77175ede98c422c83ea0449a4dcf9eae4f26afb5170c9595ef6027bf2744493874575fb94a4f85d021a529aaf97dd1f0bf61e633c3ecc
 MISC metadata.xml 348 BLAKE2B bb75dc7a62dfbe1f2128ad84e77dbff5498ba9eac61044d8914ec119b42e53c1119082bf66fa980f2b14df9ba8c48ac13fb0cdddeea60c9d6b9260dea90a8c4b SHA512 8df4f211960c247df43cccb8d2c31ad12f3699c8ef790de81602cde2fb62917c441ec2a85743b194ab716e1ecd4c64a378b3e7139bfc8d6547b768b2acbfd7c8
diff --git a/dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.2.0-r1.ebuild b/dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.2.0-r1.ebuild
index f6d23be90fc7..9e7e724e53ef 100644
--- a/dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.2.0-r1.ebuild
+++ b/dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.2.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/s0undt3ch/${PN}/archive/refs/tags/${PV}.tar.gz -> ${
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index bb8358fba35e..4304fa068308 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,17 +1,7 @@
 DIST python-gentoo-patches-3.10.0_p1.tar.xz 10068 BLAKE2B 1c9817b449831559f0a0b722c02a5f55d94b3dfde98e5882c1403fe24a4addf7074ab39c09b91cff6fd7ace2e4b6e8ed899d9a0b9ffd6612ce315c4c192bd309 SHA512 39aa41dbf17b6dc5255491c75031a3dae6962b44125e426dbfdce365a6533c5dae9856b1fff8016a189124b7cff72d2665ce99da344c2f9dff005ba685e8c2c4
 DIST python-gentoo-patches-3.10.4.tar.xz 8592 BLAKE2B 67fba3e1fedb17430e5cd93da995b4acaf714db512031b5a2f775a25f793f007941561663cfa413d645ccddc2e22d65d250a40fa166cafda8805488d877ff57d SHA512 3ed2b8ff8f1eb8febe7dcd4b5d13d6d54468be1d525f8f1118977d3bbc78f690a597b09383939d023b03380a306e4bff1693382e29ff562312d803305b1709b2
 DIST setuptools-60.10.0.tar.gz 2420706 BLAKE2B 66d7f3b648b1e3222736ddf46ff97441bc9ed4dc528e0d4ee32ef18c99b2d3488e7525a1598a18df4f2cbdac409a4096a40539807c343d99707068a15003111d SHA512 e679bd84d31cb68f92899e0b25d5a6bf85cf63d9c8e1dfbfe974d7bf819cb36f451596b8715000be6a93656b972dc6c4d90a8a8534a6c88874a0be8140f2f091
-DIST setuptools-60.5.0.tar.gz 2292478 BLAKE2B e41b2717b34d454b3959ee5b6f4fdc70dfec13d97fe6962bd1c1ea2296be8ee2d27bb14ed2cc5e6fb9a757661a0415984b3cf7cf1665347c62a50965f651f9d4 SHA512 b2cf7d99e60d0c862a7a4fd8e806019db52502de48ff77556df26ce39a8620f476de767e2e8be8aa260366f54d1429db8a42d538345ec2cd2cfd5286e62e770d
-DIST setuptools-60.9.2.tar.gz 2425956 BLAKE2B 09baded7eef555ebd76db1672d69cd06cf6bcfc1126ba0fb0143b038d6599998f53460afc914f761d44ff25710802f6f371a793dca60040240cc328da0a3ea92 SHA512 be99bee951797632a68d08b94e0b604763662c13f58cecc872615081036081b3d72c5c468af47649449d6f7422f52ee99cf2f87fa9c840d10f98cd0217c0cff2
-DIST setuptools-61.3.0.gh.tar.gz 2643769 BLAKE2B 4ede87e7a597a6916dc089c311b0e4d098b08debbd1c4a9cb97078730e9cdc8dbcacd4236ca98a42e3cfafdf66d8f39bb64bc9135291335224b1c3b0bf79deff SHA512 35e2b848cf79e577b8c469562cb68a80b27d42d2d9c1c94f84fea9beb85e2db0796ed64d414add67a404d801c4f4e6cd489a72153de4dc8ed8b45fab24c28fd9
-DIST setuptools-61.3.1.tar.gz 2508220 BLAKE2B be59b7f666d8cc583b98b73d681eddf2d15e1437f05ddb534cb6e95bf458aed01a6e136ddc10bef2b2f66fe3f888187ece8262906079f1321f194e03a93fccca SHA512 463f2203416a298f65b66199fd62941ed32fc0914a4b6afff74b4abb8db37c063ab208a67383b5a7e6108a8c1ed0fda0fbb6b47d8fbc95c68b9e23e4ba152aec
-DIST setuptools-62.0.0.tar.gz 2512032 BLAKE2B 688afed5a19e70a0fd7ab91a8d137e6641597d9f9acf31826216cd59e4632872a9661fe9ca18e45aec5cd40e52956147aa8d40ac2c376380ffa0f01dc2997e63 SHA512 9017ab055c81063eaf741d45bd2479fcf85d15795bdcf0fa55522d194a69b5a912cbdba94e9eeaa6cf2a6cdaa5dda09604205d6e02d56e7c9fd3be4c1c79ba0a
 DIST setuptools-62.1.0.tar.gz 2512885 BLAKE2B a26a6bd5001922885b623bc7f1d42da90c59e6d9e195e9dd292ce2e73cd35a51f07fc714261c12db2fdf4510fa1137f57e7f3f649312f6a75035b9d927936a7c SHA512 41f39b5aa22e908c123e8e04c11e505e23cd3aaaae72793e106015dc14b1a44ff3b17aa15ca3da34f34a4becc887ceea7f41932650e38d409f95d7227707d2e1
-EBUILD setuptools-60.10.0.ebuild 4151 BLAKE2B 6a8bf5cc57f6630005c3d3e6f148c477aa3580a76b7b1b1b05f00a7f8e575d863e32a4be453d0928e632c82729f14c03ad2944b5ea225718c0874464e6e05bc7 SHA512 e8c290b0bee28b8a1c46857f87c77e29f9da308c090ef63e3d89480bb07987abd2b7d1f3bcfafa06aae74c1557faca4f074d2b04f6583a2afa01a51b7b2004e5
-EBUILD setuptools-60.5.0.ebuild 3390 BLAKE2B a09d42356a06479ce365fb4b4801e5a277f35f6d5681302b999a698425cab62487b2107d98ac3005f8a1f3c8fd23d25ef9cc2f4c7a5328c5b5019c70c1041947 SHA512 9350c14e27a87e688c6de13322186ac9db497364972081015a5ae1a0ba6dca04ff3acdf531eaa4a6cf8e5c1eedccb9be8a62f54e292ecc6da568f9fb2c47611b
-EBUILD setuptools-60.9.2.ebuild 3956 BLAKE2B 5013ad7c02e428936c3c5e629159599c1c8c01a46cfe2bf8df77e7484b9b9165c18fb5c8645f0ffb8849c144a863550fdd1f6af7e979ba8718df9044fa603720 SHA512 81b1ff2c6c741d275f612025877f357d479b178a7ffda96111509de292f37a8c07c45a295d059e939969c39e11e3d960537f8cb14162dd25ebf1fecb0340872c
-EBUILD setuptools-61.3.0.ebuild 4526 BLAKE2B 2b1d6952fee808efb8e1dda614e6176731b0641766f514843b09b7b7bb1c8f2e261d3760365b336598b0d8e828bd6999428a41a693779b9b2639f16eb744cbc5 SHA512 7189e40ca7220000e0f16799fd52b428a3260c61e33377ce7c770973fafb63aa77982020f161865b94048c7fc5d518db6cce0ecbe7e75f83019995e78aea2231
-EBUILD setuptools-61.3.1-r1.ebuild 4685 BLAKE2B 44435decdf3ec74c003b32a94023c27693260b9eaea400f368ee64bab7f77847f6375523bfab4002f3c4a59f284313eccc0834b0dcb7d3ef17b89bbed2ed48ee SHA512 d13101956cf6a5dc8a53f0df2d8dcc05fa827142b7eb5df10617644a87a6ebc7bf95249781a3878d294db56f15c619e8935f321e8a97011095b65fb79279a48b
-EBUILD setuptools-62.0.0.ebuild 4724 BLAKE2B d36f66d74308238100fd6a4bf38fe413c186148e805a39dc1265f40e110b85599ac03ba5e9d6001759f2b141e241b1da5e0f1b58d23d8729fb7c540c4fe0449d SHA512 b362315e7d477dfda6c70f1ac2b4e424a120780068623105d08bfc53ccc1d73607f04e92c94c3dcf682d41069c0891e89fa2123c222ec02a5f473d0e2fc8cc2d
-EBUILD setuptools-62.1.0.ebuild 4763 BLAKE2B 08dbc70490ba0a1d786e4ef280354f8b1647b9eb7700013bb0348c671d7021cd0bbb1b9287fd9ed539e755d8486c34217d77ac2fd0ebb077f49199115a82294a SHA512 aaa6ac8db44e94059c71a8a053bd6142efb2cf70d44dac8d9d39bcf4b91d860f96d1cea9f85012d4962c0c4374c91534848c312ae100dc83b08ec73491c60f8e
+EBUILD setuptools-60.10.0.ebuild 4150 BLAKE2B 1b4cf02169341ebf4a7ef6983258c7fe7c41dc230ed5585a224759b449f6b90c27402488a241e7a6e30fdd8c8b6520ff5864da5b49759a422c6350605e42e09f SHA512 26179a6c4094481eebe31b624884a77600f2fbead02d49b218cf15fc92cb68b908223c7884131cbdd60926d8abd7b346d96c661549db75e87ab907515a3cf1cc
+EBUILD setuptools-62.1.0.ebuild 4762 BLAKE2B ee33fa0b41648cbc6e1207ce3b512377b51c2a1cc0e4163098dea2a19990eae2f49a72a4b31cbc1e825edd717d199bd5eed3a1cabc157c0f6a29decbc76dfdee SHA512 8886ac06c9561716eeaf41f180890eeea279b364c67ca6a3c5f90934b246c3c75bd353583893fb688b8f679ef49b2c578f5114208dc69451b1115db9ce898b0b
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/setuptools-60.10.0.ebuild b/dev-python/setuptools/setuptools-60.10.0.ebuild
index 9912015103d1..642e67d25a5a 100644
--- a/dev-python/setuptools/setuptools-60.10.0.ebuild
+++ b/dev-python/setuptools/setuptools-60.10.0.ebuild
@@ -18,7 +18,7 @@ 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/setuptools/setuptools-60.5.0.ebuild b/dev-python/setuptools/setuptools-60.5.0.ebuild
deleted file mode 100644
index dc855eb59064..000000000000
--- a/dev-python/setuptools/setuptools-60.5.0.ebuild
+++ /dev/null
@@ -1,96 +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
-
-# Set to 'manual' to avoid triggering install QA check
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-CPY_PATCHSET="python-gentoo-patches-3.10.0_p1"
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~floppym/python/${CPY_PATCHSET}.tar.xz"
-
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/tomli[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' python3_{8..10} pypy3)
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	# apply distutils patches to the bundled distutils
-	pushd setuptools/_distutils >/dev/null || die
-	# TODO: distutils C++ patch?
-	eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch"
-	popd >/dev/null || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	# keep in sync with python_gen_cond_dep above!
-	has "${EPYTHON}" python3.{8..10} pypy3 || return
-
-	distutils_install_for_testing
-	local EPYTEST_DESELECT=(
-		# network
-		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_virtualenv.py::test_clean_env_install
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# unhappy with pytest-xdist?
-		setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index
-		# TODO
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		setuptools/tests/test_test.py::test_tests_are_run_once
-	)
-
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" epytest \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" setuptools
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-60.9.2.ebuild b/dev-python/setuptools/setuptools-60.9.2.ebuild
deleted file mode 100644
index 824ccd965cc4..000000000000
--- a/dev-python/setuptools/setuptools-60.9.2.ebuild
+++ /dev/null
@@ -1,113 +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=standalone
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-CPY_PATCHSET="python-gentoo-patches-3.10.0_p1"
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~floppym/python/${CPY_PATCHSET}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.10.1-r1[${PYTHON_USEDEP}]
-	' python3_{8,9} pypy3)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
-	' python3_8 pypy3)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/tomli[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' python3_{8..10} pypy3)
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	# remove bundled dependencies, setuptools will switch to system deps
-	# automatically
-	rm -r */_vendor || die
-
-	# remove the ugly */extern hack that breaks on unvendored deps
-	rm -r */extern || die
-	find -name '*.py' -exec sed \
-		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
-		-i {} + || die
-
-	# apply distutils patches to the bundled distutils
-	pushd setuptools/_distutils >/dev/null || die
-	# TODO: distutils C++ patch?
-	eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch"
-	popd >/dev/null || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	# keep in sync with python_gen_cond_dep above!
-	has "${EPYTHON}" python3.{8..10} pypy3 || return
-
-	local EPYTEST_DESELECT=(
-		# network
-		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_virtualenv.py::test_clean_env_install
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		# unhappy with pytest-xdist?
-		setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index
-		# TODO
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		setuptools/tests/test_test.py::test_tests_are_run_once
-	)
-
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" epytest \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-61.3.0.ebuild b/dev-python/setuptools/setuptools-61.3.0.ebuild
deleted file mode 100644
index 297662e04bc9..000000000000
--- a/dev-python/setuptools/setuptools-61.3.0.ebuild
+++ /dev/null
@@ -1,131 +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=standalone
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-CPY_PATCHSET="python-gentoo-patches-3.10.0_p1"
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-SRC_URI="
-	https://github.com/pypa/setuptools/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	https://dev.gentoo.org/~floppym/python/${CPY_PATCHSET}.tar.xz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	dev-python/nspektr[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.10.1-r1[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/tomli[${PYTHON_USEDEP}]
-			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' python3_{8..10} pypy3)
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	# remove bundled dependencies, setuptools will switch to system deps
-	# automatically
-	rm -r */_vendor || die
-
-	# remove the ugly */extern hack that breaks on unvendored deps
-	rm -r */extern || die
-	find -name '*.py' -exec sed \
-		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
-		-i {} + || die
-
-	# apply distutils patches to the bundled distutils
-	pushd setuptools/_distutils >/dev/null || die
-	# TODO: distutils C++ patch?
-	eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch"
-	popd >/dev/null || die
-
-	distutils-r1_src_prepare
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	# keep in sync with python_gen_cond_dep above!
-	has "${EPYTHON}" python3.{8..10} pypy3 || return
-
-	local EPYTEST_DESELECT=(
-		# network
-		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
-		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_virtualenv.py::test_clean_env_install
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
-		# unhappy with pytest-xdist?
-		setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index
-		# TODO
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		setuptools/tests/test_test.py::test_tests_are_run_once
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		# expects bundled deps in virtualenv
-		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
-	)
-
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" epytest \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-61.3.1-r1.ebuild b/dev-python/setuptools/setuptools-61.3.1-r1.ebuild
deleted file mode 100644
index 722c799e855f..000000000000
--- a/dev-python/setuptools/setuptools-61.3.1-r1.ebuild
+++ /dev/null
@@ -1,132 +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=standalone
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-CPY_PATCHSET="python-gentoo-patches-3.10.0_p1"
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~floppym/python/${CPY_PATCHSET}.tar.xz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~m68k ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	dev-python/nspektr[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.10.1-r1[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/tomli[${PYTHON_USEDEP}]
-			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' python3_{8..10} pypy3)
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	# remove bundled dependencies, setuptools will switch to system deps
-	# automatically
-	rm -r */_vendor || die
-
-	# remove the ugly */extern hack that breaks on unvendored deps
-	rm -r */extern || die
-	find -name '*.py' -exec sed \
-		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
-		-i {} + || die
-
-	# apply distutils patches to the bundled distutils
-	pushd setuptools/_distutils >/dev/null || die
-	# TODO: distutils C++ patch?
-	eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch"
-	popd >/dev/null || die
-
-	distutils-r1_src_prepare
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	# keep in sync with python_gen_cond_dep above!
-	has "${EPYTHON}" python3.{8..10} pypy3 || return
-
-	local EPYTEST_DESELECT=(
-		# network
-		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
-		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_virtualenv.py::test_clean_env_install
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
-		# unhappy with pytest-xdist?
-		setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index
-		# TODO
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		setuptools/tests/test_test.py::test_tests_are_run_once
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		# expects bundled deps in virtualenv
-		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-	)
-
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" epytest \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-62.0.0.ebuild b/dev-python/setuptools/setuptools-62.0.0.ebuild
deleted file mode 100644
index c790346b25a3..000000000000
--- a/dev-python/setuptools/setuptools-62.0.0.ebuild
+++ /dev/null
@@ -1,132 +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=standalone
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-CPY_PATCHSET="python-gentoo-patches-3.10.4"
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/python/${CPY_PATCHSET}.tar.xz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~m68k ~s390 ~x86 ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	dev-python/nspektr[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.10.1-r1[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/tomli[${PYTHON_USEDEP}]
-			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' python3_{8..10} pypy3)
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	# remove bundled dependencies, setuptools will switch to system deps
-	# automatically
-	rm -r */_vendor || die
-
-	# remove the ugly */extern hack that breaks on unvendored deps
-	rm -r */extern || die
-	find -name '*.py' -exec sed \
-		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
-		-i {} + || die
-
-	# apply distutils patches to the bundled distutils
-	pushd setuptools/_distutils >/dev/null || die
-	# TODO: distutils C++ patch?
-	eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch"
-	popd >/dev/null || die
-
-	distutils-r1_src_prepare
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	# keep in sync with python_gen_cond_dep above!
-	has "${EPYTHON}" python3.{8..10} pypy3 || return
-
-	local EPYTEST_DESELECT=(
-		# network
-		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
-		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_virtualenv.py::test_clean_env_install
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
-		# unhappy with pytest-xdist?
-		setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index
-		# TODO
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		setuptools/tests/test_test.py::test_tests_are_run_once
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		# expects bundled deps in virtualenv
-		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-	)
-
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" epytest \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-62.1.0.ebuild b/dev-python/setuptools/setuptools-62.1.0.ebuild
index 164807a76589..13523e6b5b8e 100644
--- a/dev-python/setuptools/setuptools-62.1.0.ebuild
+++ b/dev-python/setuptools/setuptools-62.1.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index ce76f61a76ec..9b8442ddf7ad 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -9,6 +9,6 @@ EBUILD sqlalchemy-1.3.24.ebuild 1817 BLAKE2B 7cf908d3be350140f1f1744ed3361bd2fa1
 EBUILD sqlalchemy-1.4.31.ebuild 1904 BLAKE2B 0e84fa418b508f4793ceabbe655c227b3f2cd92bd626e5ecde35a9996182f24690db87cfaf5172eec8d0ec27e425824180fa1f5fddf4b68ed026d7c6ad95a373 SHA512 9dad795092985c87f6929f9e8f4184ec3ae99458e2bf2518da13769c059bb24b91782d8fb4d5b00e7eb5e477428cd1eb7c1dc2dfc03c521bc7576aafe52153a5
 EBUILD sqlalchemy-1.4.32.ebuild 1918 BLAKE2B bea31a01db2aced03a30892bda95b78b949a3f7cc3f447a9657b12b2c2c42680b8426bce9d2033b3e752d28c2ac23766c3ddd154ded311986bc0606114ac0533 SHA512 ec947ce600497e7dd9c46f1d318315a209a84c22bcc42d67949e1310eccbd8b706dfa93805123ea935d793e4299de61004c3693fd695af5c0dbc02f351d0d4c4
 EBUILD sqlalchemy-1.4.34.ebuild 2082 BLAKE2B 0afdbc46dc7e213d0d7d8a4ccd20f6610cd631a2ac6898db3b6c8e95701e09caa8871e4942033fd44fff23890c0be7a8a768517ea970f7c5fb080068cc239964 SHA512 cb939b3f14a15cd546b5cadfbae406607fa95be07436167586b424aee80fc382988daf07f77c60d09c55d0846825a3a30bed64b10bfcf520e1e09caeb0375f77
-EBUILD sqlalchemy-1.4.35.ebuild 2595 BLAKE2B b822726857701dc632b502f098dbce617c9d3220132d4b515167107bad12c558756c09e7abde0c5d0dae0027a1d728f210f53ac649d972531f62d5af80a1bc83 SHA512 fe736b1bcc67a38e2593033dde5a294d5695204810e6c94d79047192b0a5a743454efa21507aa41add6c3eba1e891b3ce81b8bf5effdfccf9a0d2ae71851496d
+EBUILD sqlalchemy-1.4.35.ebuild 2594 BLAKE2B 26a563485558a64cfd503636a0c011b452954360b7bb486fa653e6a606aadb5cc7a2fda6ee0046ea1dd1b7a9f3883082a63e6181a023d665123150ee27505901 SHA512 0f5d19cc587e69de704f71696907bcf211fa6bfcd2f3adf804c5e7276c3969701758ea0171023f87034177de8512f0b8b10f73c213f97aaa2f9be9a30939b094
 EBUILD sqlalchemy-1.4.36.ebuild 2608 BLAKE2B 0e39ebb935de30b33f01acc23579b4340d7b74dc72df5becb8529b5c0ba946f8024270c1e187a2b2acb38be488823f1732074997b31c4f3eb1009af45131b48f SHA512 e3c9f3e023142f0f846cdd95d0eb427cd5a7af08689aa6ce2d8fbcf4dc6ae30ce4492919186a3f67fbe08b0927dfb45edc0709e85f298b816beb29ef6835040b
 MISC metadata.xml 444 BLAKE2B 5fbfcf8f16e52ab5bb691b0b33a8491d94e42a80409114cd9b306af7d4b0eb8b6660fabc663adee53080c635217961301b78df536995b91afe9288d255f73d62 SHA512 b432b65ed3033d34ac0784d007909eb838b309b6a4785eebb1a3f808e43dfc41c786cd55e4dd048776c65127aac170bdd9fb9e5a8ae63accb5f65e300bca9676
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.35.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.35.ebuild
index acdee3ac7207..dd0849642f70 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.35.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.35.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 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 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 BDEPEND="
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index ef110720eed2..50c02568617a 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -1,5 +1,5 @@
 DIST ujson-5.1.0.tar.gz 7128147 BLAKE2B edd5b944e98790f3b98c4e2dbeebd1bb058c7b10e07d7919d3354cc2bcc1c8398b5bea08d27cdad438f2aa4a5d340da377ca9ef9b4b03b3d5b0e3053787ee618 SHA512 8988696918402f9e540e878eeafb2d29ed2819d4fa6ca801251a0411981eab2663eb16599a37ffa531e2e036706bd27cb1467bac17c33579e010d106da488951
 DIST ujson-5.2.0.tar.gz 7135591 BLAKE2B 1207e1eae65f859018bbb7a868c2b2010c0e4b41214ea63c1aef00a41600f69e941a1a02d22f1702f3974a3f12e90a731717681e6e9a9e782fc49716b4b13cef SHA512 c0ef90bdaa2d5e02109ea3e01288ff9ab4e4bd865ea0a33d915de2878cb13a04f24fe278f86582e042b430e6b20077f2b337d6a4349777a803e9725666952fd6
 EBUILD ujson-5.1.0.ebuild 700 BLAKE2B 8623a8cf255d688321437699fdfb60b67025747fc1db44bee130c57f9fc0e94ba9b0b9fdd5d8e2a806c8c9b1f62d28c7bc975476d2f86cba0b6e3b9c5a7a84f7 SHA512 8033e0b4a6dfcc82dd5e4268147ef22c5237a0f2f58abe108ea72e645790b788b92bfba8ee6e543842d7bb943da650fcb157b2610056982c61845b71f47a61f1
-EBUILD ujson-5.2.0-r1.ebuild 826 BLAKE2B a63826cc2935847272c60eba0975e5073ed783f9bea8a3aed8f533a509a6cd423dccdb4584690b4bd2c3f63a8c0623869bf0b4c060778ff42054fe1fddfd8275 SHA512 60577696399f18c39c66883451363826643fc518c46c9b29309af4062f14903a3106ae541e24225c531bd2c84155a049fabb4c80d87a9e01bc261a0e65a63b0e
+EBUILD ujson-5.2.0-r1.ebuild 825 BLAKE2B f90044fcc282e40cc78e7f042693349bca92d3e61a1ff49e1ffb8a03b1723b862eb62aaa680b6feb98622f5fc40ea33870afd69779a11e53127b4acec69d291a SHA512 2d228a0b483c039844e0f562c40dcd2eb64d8fc8e63da9d3a5c4e888f179d2a31bb84e6f9d2bf0e557feef1341f0c2291a1858e00ceb650c8a25b328427138a9
 MISC metadata.xml 494 BLAKE2B 8e20150926d62643e7ff2110cba22313db0c0e3112290ce08302d57103aa35c42a56921d0b46e0acca2ef83756eb4f7384f23ddb06fe41ef6c4a28921f11ec33 SHA512 d9c0a59f916b84d50e51a21152c1815fea90a909dc9bd44ea620b2a33ca6a92ee237aafe29debcc9d1a2bf63c84112300845309eb0ab1265e5d2b0c05dd313f0
diff --git a/dev-python/ujson/ujson-5.2.0-r1.ebuild b/dev-python/ujson/ujson-5.2.0-r1.ebuild
index ce124a40a3aa..f0755a0c8f37 100644
--- a/dev-python/ujson/ujson-5.2.0-r1.ebuild
+++ b/dev-python/ujson/ujson-5.2.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	dev-libs/double-conversion:=
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 32b0aa2ad8a8..46aec85bdd5e 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,7 +1,3 @@
-DIST watchdog-1.0.2.tar.gz 91796 BLAKE2B 001cbe82ff8aff0c4e56e4d1f02519047580cccb48466566ad7c9c1f462f90a9a036cf90846eb38ec4fb24ff1df2a1ddfec20b3f0587afdc1f938ada1bb0b1ef SHA512 e87a0955ce822daabd7d030804876698f98ed2aad58486e26a94585763655302063f091b653abd385ea99642361b6253d8e051d96019b243a77b078ba86b0d6e
-DIST watchdog-2.1.6.tar.gz 99756 BLAKE2B 5ea08660c28f77be02b261a22e6fbfdfaaa59f79af1eecb396fda2e56ab4b5b290dc2c791b31a6841ac6d96c7974d51e846ce0232e9de6728f6031685685e761 SHA512 810ee2c40d92102815685c6e06bee403dfb85df7c8de5f1b7066b27cef2a8e25f506f8d9cc0ff0ec3213b889a7844138692fd9d1ab0c40d0aa2097c55e85f531
 DIST watchdog-2.1.7.gh.tar.gz 100442 BLAKE2B 21247e1790077eb1eb2f1dc2bb8ddebc1b7f6a2c503238c52c660246fee8c1d3483119184a62114efb81c44665321d4e3aa18ffd73b3244a44c4c6df5204c834 SHA512 f69265aac6e8a840d230c15cfe88c803f043cb540785446113617c0fd1a3c5dce8a885a376bbadc75372a718800948dd4b00c618e18e033d510b8e2bc2bbb36b
-EBUILD watchdog-1.0.2.ebuild 965 BLAKE2B 35bf7d74d9da00f8a7b69e6394619867c4cf6947e5c14d8aa833ea1a099515529f7bdb5bb02a59a76c5629e7e38dfd560df0fc63d23fef5210d5b42ac0dd9a7e SHA512 a709f107fce0b758f9a4e522052fc8a6b7bcc0c7b87aa79fb53cf8c8ce035bdd4141df117b983d869f21af7410c7d6cc373fb65069f74c049e2b703863c06fbe
-EBUILD watchdog-2.1.6.ebuild 1001 BLAKE2B 80d535d6767a94b297b2c917da112ba1849a448dc8deac3a022eec5cac62a9931b988afc2f36aa32a005dea5aeb0392981c19bd4d1b6f48bc0f2193479279c87 SHA512 e154129f731ad7043d5a38df80319b1270ff4e2cd3267064f2a4a408fce62a7fc63f4f636f79c6e857fa60f8d447384bacc3a8319881e0f7b446a2ccd001abc7
-EBUILD watchdog-2.1.7.ebuild 893 BLAKE2B 83205334c9c1a56764d004c0cd1f98540f6b1c5761467654d32b02766e797410f5be539aa8633a5776280d1d5d4ff68468bbdb84d65de3751e143406a9a097ba SHA512 2c71dae6727821044b0493c6fd793fa5e26d4a06d798424bdbcafe42c65ea4a942d96e027b9c290336ebd107083ffb63cd035b8d85b61b1046fefb0f80e2586b
+EBUILD watchdog-2.1.7.ebuild 892 BLAKE2B 3afc00dcb1318d2641446705be8e2cd7444830df2b28299693ec7b36d1d08cebca805617a8ccc1b5b8e3ae4370e1bf56b946a476ff41fb9fac9dd54d705e4c1d SHA512 cc9d18940bcf0b5ce5e2864a256e54e0c926d7a13cb9f02c10432c0d121f9f229af9455eb95e4fbf6ae9bf6ac4325f8a4b62e751371689818dd246adaa00e8c8
 MISC metadata.xml 463 BLAKE2B d4f4a77cbba45384d34ac533c223e6640f75460ebfa46ae029a57297ab1a8711f8c10bcd0c11926651bd61d5a2ae98e316ebe40c6011de06f8ee46ad5fcab5b2 SHA512 5eaf8c60e47afa3933115e23cec07340d8cb708c9c9568cf943030db2ed7e05771f51369d6d7d8e21ab598dc872af275784939a243a37abb1e3661b41f479721
diff --git a/dev-python/watchdog/watchdog-1.0.2.ebuild b/dev-python/watchdog/watchdog-1.0.2.ebuild
deleted file mode 100644
index 1dc52e0423d5..000000000000
--- a/dev-python/watchdog/watchdog-1.0.2.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python API and shell utilities to monitor file system events"
-HOMEPAGE="https://github.com/gorakhargosh/watchdog"
-SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	dev-python/argh[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	test? (
-		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/--cov/d' setup.cfg || die
-	# broken when django is installed
-	sed -i -e 's:test_eventlet_monkey_patching:_&:' \
-		tests/test_skip_repeats_queue.py || die
-	default
-}
-
-pkg_postinst() {
-	optfeature "Bash completion" dev-python/argcomplete
-}
diff --git a/dev-python/watchdog/watchdog-2.1.6.ebuild b/dev-python/watchdog/watchdog-2.1.6.ebuild
deleted file mode 100644
index bdf60d233757..000000000000
--- a/dev-python/watchdog/watchdog-2.1.6.ebuild
+++ /dev/null
@@ -1,42 +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} pypy3 )
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python API and shell utilities to monitor file system events"
-HOMEPAGE="https://github.com/gorakhargosh/watchdog"
-SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/--cov/d' setup.cfg || die
-	default
-}
-
-python_test() {
-	local deselect=()
-
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		tests/test_inotify_buffer.py::test_move_internal_batch
-	)
-
-	epytest -p no:django ${deselect[@]/#/--deselect }
-}
-
-pkg_postinst() {
-	optfeature "Bash completion" dev-python/argcomplete
-}
diff --git a/dev-python/watchdog/watchdog-2.1.7.ebuild b/dev-python/watchdog/watchdog-2.1.7.ebuild
index 4390d3a0e391..c7730c8bab62 100644
--- a/dev-python/watchdog/watchdog-2.1.7.ebuild
+++ b/dev-python/watchdog/watchdog-2.1.7.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index 20d268fc7024..e44469fd8802 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -6,6 +6,6 @@ DIST werkzeug-2.1.2.gh.tar.gz 833667 BLAKE2B e045f566862bfe0f86185cd10aa26bf94a4
 EBUILD werkzeug-1.0.1-r1.ebuild 1391 BLAKE2B 38d11b9aa090f534d7b48d796281d517b9e9f109b587d52f07aaf87404a58c67f3a59b1b5494ad3fb1636327bf705f8fc90d1657c49456530ef6c54c8334644c SHA512 abd534057abb560b7fe9809c3575c17529b255cf6a1aca65a159f8b46b6e3d9f4e21a226f1d5460e8a49ec1dcd9224bde5d27df468922d487044fca3891462a3
 EBUILD werkzeug-2.0.3.ebuild 1384 BLAKE2B f2e1407bb9826c6f715e51fa8e71d22e6978f64d568994d887cd18570078501f5ce432eb9ec8e8c0b787d85653b5cccd718d3401f8e39e5a7ef1d3e7d9e9622c SHA512 c5c0ffb9e3daa37ebe0f006b2e3a6d9bb515323f326168924d84babb8dcd449de3cb234f9f909b5570914be570ed0c3069f3b418d46c7d8922f4545998e2196c
 EBUILD werkzeug-2.1.0.ebuild 1385 BLAKE2B 9e332629b9e9b22f63075ef34292ad306b1ff1c2f098750ad7ec650b70abe813353c5e7833c3b1dfdebee93ce4579ecfd078d5363cb4efcf56cf5506bc1ba5ce SHA512 e176dafed63127e91178a0178438ba95b39ff56385257c1d1361a7db3bb926255d324554be0ba35b8b50b7b55b065abad0e13c2dcb8a60d63bfeda057fc41ec3
-EBUILD werkzeug-2.1.1.ebuild 1437 BLAKE2B ff79e832bbaa4c978cf0d7def2ede007f2eab4b5032344b00861d8ce06b034f7fce5be7625496c06f724df3cadc76455b34a1b792fa7b5b36372dae030e35f8b SHA512 627949b2b601f86e7af833673e41d64c58eceb03803d7478ec8300231346728b982fedbcfac85d12b50c42cf2578e9be17d954745676f3a8ac09f51c60dcd038
+EBUILD werkzeug-2.1.1.ebuild 1436 BLAKE2B 5967239c32f819ed5bb41f8defbc2a843d4d843f4fb2a50ebbf46ef4f39b2e42e2e501600c3f5c744cc9c69ddb76cffd6f526235f51d171727181fc60719180f SHA512 7c20b6cb88857b6a855ef781017ae271e1e4fd71d7c4bcd8ad1661ad024050b3b0617be6c750d8d8f4364044104c4f7967447b2f93485c56e4201f4aa258fe89
 EBUILD werkzeug-2.1.2.ebuild 1592 BLAKE2B 40d7ff7bbaebb98477d1d17ee2fac5825f4bd7cd0cc8d62423510c1443f0981aecfe08287be93fea98a39238fba2e5d1b7fc0eda7cd040a90519fa9ddd3ff1b6 SHA512 691bff7dbba624ed66aee853a9d6c9c26e30f425705b822562744b7dfb3159803431cf740edda73a8f631aa236b50501e214c58979ae8bc9f2757c97f1aad703
 MISC metadata.xml 368 BLAKE2B 81932229098620395623f9149ac974f19fae9b65ad09943ee5c5d8d03c1e37e76061291c959fe5f004f531a244b3bb335c2a43dd66949c0be43493e45674d0e3 SHA512 67e5b5fea8052c0723820125271ea031ad984e0fe2af21d2423fc559bdc51dfe1d40f2fa5fe11e6d2b8b32216e716900080b859aad146c079ad2b390dd9844cf
diff --git a/dev-python/werkzeug/werkzeug-2.1.1.ebuild b/dev-python/werkzeug/werkzeug-2.1.1.ebuild
index 175466938aad..6ae314f68af8 100644
--- a/dev-python/werkzeug/werkzeug-2.1.1.ebuild
+++ b/dev-python/werkzeug/werkzeug-2.1.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 0bf1bc3c21be..1ab15859ddd1 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/airbrussh/Manifest b/dev-ruby/airbrussh/Manifest
index 7c83780e521b..d61e1456ff7a 100644
--- a/dev-ruby/airbrussh/Manifest
+++ b/dev-ruby/airbrussh/Manifest
@@ -1,3 +1,4 @@
 DIST airbrussh-1.4.0.tar.gz 1450070 BLAKE2B 94f128cd25c5af48f17fa771c366d3cdf744dc4e7ccef23de583b1ed60ffe1640dd7d02d76fb78573936beb3412c277151b36a870ac3e11222c3135f34b0e140 SHA512 e3a5cb80365a963875e89d15fa2b4dc86985d6b5f13ecfa9baf9ad599b5780ef8ea2c2e4040bb35498a5ecd1c6becb081b3e917cfe082d2db63fd74ba54755b7
+EBUILD airbrussh-1.4.0-r1.ebuild 1003 BLAKE2B ff926aabb611e45e4905bd63b17958fdae4f2c04a2672cb5406065abcfc9c2c8d2cb74729141cb4ceed4eb8f603124b7b2cb42d7566f20f01487c1e629c5a5c2 SHA512 6e9d33da14942670d79cb5b1cd891e4ae201f75f05551cc344bd1512a2ac2a40a4f3a2b225f55ab34ab057d21c2131d7508e73ffc31471a09584cf6d82a16033
 EBUILD airbrussh-1.4.0.ebuild 889 BLAKE2B a2b6121b61bfd7a21e2c1942be0ed9cae00c8ff2a62ead036a7a00c7125ebfe46855ecefb9fd278b57b13e603d3a505e93fab81481b9d394e1d5fe95b11c195a SHA512 2a6280d45b3d9684d0bdc9369895bc7bb024a2c54e8cafc5aa9bae566276a64854f91960f18daa2043d4124afc7930af893c3b17c3c7d89f888e504fda9dca20
 MISC metadata.xml 396 BLAKE2B d27f0009de40add27cbe4a8a668ac4a82fa98eef30d794c61add8ad293db7e6b76c948499646c1dc23046cd4d88cfb36b41c1c14ebf78316ba6a4547493edb87 SHA512 98a3ccc2e6734e249cfb13754015cbd79485d20bc018312f7ff8500fa3c011db88c3955990a97da714dc6af7a6c94196057839eb76fd1612f30dba9e623ee0a6
diff --git a/dev-ruby/airbrussh/airbrussh-1.4.0-r1.ebuild b/dev-ruby/airbrussh/airbrussh-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..4915591df832
--- /dev/null
+++ b/dev-ruby/airbrussh/airbrussh-1.4.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
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="airbrussh.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A replacement log formatter for SSHKit"
+HOMEPAGE="https://github.com/mattbrictson/airbrussh"
+SRC_URI="https://github.com/mattbrictson/airbrussh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">dev-ruby/sshkit-1.7.0"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	rm -f test/support/minitest_reporters.rb || die
+
+	# Add missing require
+	sed -i -e '1irequire "rake" ; require "rake/task"' test/support/rake_task_definition.rb || die
+
+	# Avoid a test poluting the environment
+	sed -i -e '/test_color_is_can_be_forced_via_env/,/^  end/ s:^:#:' test/airbrussh/console_test.rb || die
+}
diff --git a/dev-ruby/backports/Manifest b/dev-ruby/backports/Manifest
index 8c0f3bdde363..359453bcc89f 100644
--- a/dev-ruby/backports/Manifest
+++ b/dev-ruby/backports/Manifest
@@ -3,5 +3,5 @@ DIST backports-3.21.0.tar.gz 178706 BLAKE2B b895655fbbd15e99021f3d9d4f5efe84957c
 DIST backports-3.23.0.tar.gz 181501 BLAKE2B ef9841366b27b19837e61177f727cbd0acd58650cebab03329c174d699147fadfe51b4ac404d11332e681285c5f0ddcf387bdf6304237ff32c77048a1f5670b6 SHA512 b5b16b78c4dfbadbd60735b29541268cc6446f283ad686add208974fb861b270ffc46ec3cb6702c2ecf760e0de83d31025dbeba90e79383ffda6b4ca0b52a06c
 EBUILD backports-3.20.2-r1.ebuild 792 BLAKE2B ae1508b983697efd7b4e7291a4700cb49c94bb02a43c574568283b09e73b7d592941fd05cb6f93cd879d52c3e0e7e572cad936f918a0a9e00f31f97ae34bd678 SHA512 85e46a36b524194839f3c4250382993c0fc69653ac8339666bd196ed0c48a544df369b7d3a3c885682ad70f676ee2296ac7d27007c971f8beaef1b9bb96afd1d
 EBUILD backports-3.21.0.ebuild 792 BLAKE2B 0c9e5d2b2f54c1e5c7965bd4267e4ee1e13a459753f047ced428342fe299910350ed0c75552db811a12129bead6f1478bb5a8c1f16b7d82735610c24368850ad SHA512 d147eddd18ee7abc4b630bc298141bbea1fd38e24bb2ad1b12228e943d79fba7d70296999ce2236a7d2485b2715c028e43110a8808e1486e3532bfd56fc896d6
-EBUILD backports-3.23.0.ebuild 792 BLAKE2B 56bd5d6dd71d13c6fbbd60bdd063fd06c6d7ffcf383f0a0345b398a610bb4e1d7fe4563f044b76c1acd99ea12e74c466e22d452a50bd1ac0017bcecd73ca42d1 SHA512 1a2fc3742e6f4e9c825a70fca9af637c28cd48b5d9ed9b2ba6b044b3ddff60aaa5ba032076b18292dd8ee35f7bbd6c896309c2a27665fc90c9fefeb2b6bf9d69
+EBUILD backports-3.23.0.ebuild 799 BLAKE2B 8655ea61ab77d4a07f40c3ad34b705768d66f9babb61c025d8f87e3a6d277bc9aef388b60295ece8eeb6e5a4982ba04a1bd45b699f4c4f30f2100bbb6cf4fbb9 SHA512 75cffd19bcdd2b74a93f296a7bbf6ccbfabe008d98108c4d566be178f4b793b06aee9d9d2a2dd04b51a02d704e9f9227b3e79c0781d51588e664e6f21399778c
 MISC metadata.xml 336 BLAKE2B fb9482efc94ceedae0a44003dfe8a539ed8f728b93cd5e924f5e44778049598f14874908e3ccf0b393809fe35eab9027533ddb0407c16a767012c6f04962d8ac SHA512 848ee492c5952bbc00d5cce3f17f5d68e56ee0235c23f0eec19cf0a85cf097e20484ce6ac209d4fed6fb0dcd5323b45bdc662cb9ed6fd9a9bf50321724df3c5f
diff --git a/dev-ruby/backports/backports-3.23.0.ebuild b/dev-ruby/backports/backports-3.23.0.ebuild
index bae239847268..555ca131979d 100644
--- a/dev-ruby/backports/backports-3.23.0.ebuild
+++ b/dev-ruby/backports/backports-3.23.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 RUBY_FAKEGEM_TASK_TEST="test"
 
 RUBY_FAKEGEM_GEMSPEC="backports.gemspec"
diff --git a/dev-ruby/base32/Manifest b/dev-ruby/base32/Manifest
index f69eec57b8de..6059908b91aa 100644
--- a/dev-ruby/base32/Manifest
+++ b/dev-ruby/base32/Manifest
@@ -1,4 +1,4 @@
 DIST base32-0.3.4.gem 9216 BLAKE2B 370c18e0e4689a3f59d7a75c03ecd1cb43d1748fd2239d3b9755e529c79863af8ad1c747e445d1ffdce7d900ea5300a12d1b63f6045798e4abd308efbe4d79fe SHA512 43ac8e2d2e801401f57d8013cf55cb5ab19a6349e610af151220a18f1b997d3a29d1423db93c4169a2b335d988e8458be447415d2bbc7745592fb3eb54dea0ff
-EBUILD base32-0.3.4-r1.ebuild 512 BLAKE2B 8369e1fcf678401249da3480e23c097b973449bdc1315316b88278e3c0e2668e71628fd687dc6c7982e7a4fabe625d8793ff24414b3d4fd35255f2360f7be511 SHA512 8559fc9e94bfceb47717e0387f97701411aa707eeaadd1b03d21b58d9ab938c90f8ceaa1baa22c2a66734b07cfb25add23977cfe930adb52c497f47380926179
+EBUILD base32-0.3.4-r1.ebuild 519 BLAKE2B d13dd3ad9edd5dec5c3809944bf0f6d03a88eb0ffca64673770387411edb18fcddc3bc6eb4acf7a38c85a5eba2c2cc6ea39724dc308ba86d682316b994dcd3f0 SHA512 5147869fa6ca1f6b33bd51977524639a478b405e8442f896e7c975961c57ba20bda6288b7de035d55a6b36127def7cec0ce29a8cb5d172109cb24d38e359509b
 EBUILD base32-0.3.4.ebuild 512 BLAKE2B 89e9c83f858c1910d3bf441db558d45bb6b01f23eadb6d68a39845fe93de8ee2f0a9038be7ab1c9b1940ce34538c3eb59cda756163d8a73be90361a407d6082c SHA512 3cfce8f5b54f213ef7f5bc3f569d37d9a07aa4d1d0c945af837dc962548804d0bed4e82600615cb341201ff05fcb39b1203978fee65a19c26d1db3d967fd328c
 MISC metadata.xml 378 BLAKE2B ad0d76f14f02df074e2dec486e3451dcbd0d29c358b28b82e241d56410d5b6c78a524d261372a747c713fe301f4d43caf9acfbace8bab9316954c9f2857ec6b1 SHA512 d46a84168b74053cbeb4b11eb2bb7d1b62e8449b7704c969f8d2e6eeaad5250bc143695860dd6d26a8951a8994eb5e20dc8c2bde657fac360e96d95cb8d91c45
diff --git a/dev-ruby/base32/base32-0.3.4-r1.ebuild b/dev-ruby/base32/base32-0.3.4-r1.ebuild
index de1ac86309ed..ebb79637eb79 100644
--- a/dev-ruby/base32/base32-0.3.4-r1.ebuild
+++ b/dev-ruby/base32/base32-0.3.4-r1.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
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/bcrypt-ruby/Manifest b/dev-ruby/bcrypt-ruby/Manifest
index 24a711444cc6..fa6db983c0e7 100644
--- a/dev-ruby/bcrypt-ruby/Manifest
+++ b/dev-ruby/bcrypt-ruby/Manifest
@@ -3,5 +3,5 @@ DIST bcrypt-3.1.17.gem 55808 BLAKE2B e2e3d6ebeaf3d52fa69eb2da340c9558c09f526cc29
 EBUILD bcrypt-ruby-3.1.16-r1.ebuild 1519 BLAKE2B 9ff961a847dd27953e2e32a2e3fbbcf25daee6911dac73cb4f924b4c13c3a807e7d9c5ea1144ad61309de8a300766baf61a7a65f473f1618934e55e4722c91c4 SHA512 5d87dde0caaad763eb7e8ecb96becae9f32e1fb82c7ed9de8f2449530f26bb35375c5a0559dca66372e8c01e9cde6abeedf98140dcb3973b93c0accc8dc4c805
 EBUILD bcrypt-ruby-3.1.16-r2.ebuild 1519 BLAKE2B 81fb15fe435f56c71cf63fe954c73b634a2b6e52e897558e3b345b5b06989e8bb7a70f1df2b0a0278bee3a88433aae7b6ea3935bd347c33487fea39e60a875ab SHA512 6fdbd5bf05a55e60d2d3aed5cbe1e6125552c91c6700192ecb8e6b6fe0ff9f8a2004b3a64e9cde134963756837f31aff26d5921521b62ca3c921bfca563f9e2e
 EBUILD bcrypt-ruby-3.1.16.ebuild 1615 BLAKE2B 4534b33b84d784b5afb0a86da52bd8c3cac4c8e9c03620b2091644eb88e308d0a7e70d3b9fe5d8f6845861af79b5fceaf022b9136d68fe9bedd066f509b6d436 SHA512 870b244082f21c1241b2dedfc8ef904e35260683c0ea2e164043e69078d0f28f800082cf8ce1a59c53dfcbf080b1f20e788ea582bc956929f1bf9bb8ee752026
-EBUILD bcrypt-ruby-3.1.17.ebuild 1526 BLAKE2B 54f49baf5098316d84e9515bb2cf0c8f32d218c4e118ff17b12c481d390fbeaf1f0ba2ede4b56c8dcfb24fd46c218a1fa504ec0bdfd60818f3236e0691e6ab6a SHA512 9503fda57c18b77247f4b12477700402e78e5a5a51ff1d366fd926cc5666fbd514ecf03d7a9f27f6332e291d411f6a2c08e75635cba58d3aa5033b7fcfc849f3
+EBUILD bcrypt-ruby-3.1.17.ebuild 1533 BLAKE2B 69738a384505b712164237c827ee423b29a778cf4aa1ed4a9b4c498370cc03454da18ac784df7db8b90d4e82155b577a12dd31220297ab975617a18d8862dc8e SHA512 5e7dcb1ee2eb9a855a42f0c46f8b066f844a663afb189af9b1d8b5517752770f8254949d67632768a2b67165f2e417c57689b3fbf13aaa1b8e0baa4a43c3d448
 MISC metadata.xml 347 BLAKE2B 5430c9a624d1e922507758954755b4b7e29ffc5c9bec8a78bb9a726b17fb50e492fbf7476964cba269b80d1c6d34ab4ad9d482115825b6c18a25d61fa6dead89 SHA512 901e5c0b9da6c30ae04a0976010dff1faef88fb07d190ecea9eee06abaa1204280176b94dca90e0b5bc5af6423bb72a0657d8460eacd22b8aaf48fbf30b9f2c8
diff --git a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.17.ebuild b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.17.ebuild
index e17248c3c712..2d97b3822298 100644
--- a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.17.ebuild
+++ b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.17.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/c21e/Manifest b/dev-ruby/c21e/Manifest
index 100c022dca6e..54c6939d7cff 100644
--- a/dev-ruby/c21e/Manifest
+++ b/dev-ruby/c21e/Manifest
@@ -1,5 +1,5 @@
 DIST c21e-1.2.1.gem 6656 BLAKE2B b6c1f8919206e8eea04a33fb3a21c42e1758a2dbfbf2ad06486543e8bfbd37234d3c8a113a10c8473d04873f20076baed042e90eab34b96b6ea10c7cc6684ad7 SHA512 1f36251c4c6c7923d46ab186df1f1d380cb329daa7316327f65d4221493eb988fdaf83f2b43e8eb7eebef9e58f8b475bf4b36095cd4cfdb4a787719eca4b36a7
 DIST c21e-2.0.0.gem 6656 BLAKE2B 64b840ee83bd89ae29486527f4a0f59bc029dc27217bd48944629c357a7c8845cc98521054ed88f4c1cdc967f8248b3bf7a8b74019d181c60312a35f8a6f9dbe SHA512 e36bd75c87608efb1bb776f69b3400a307a2a1d1bb6375246613a5aed53a4673599a61f7723a53cae3a639e1bb2dd03b6635d54979de4e32885fd3cb1f29a1b8
 EBUILD c21e-1.2.1.ebuild 433 BLAKE2B 2e456c2f3943665ca5f094d5c2cbf978a74a027674b14c3c6d441d4d962fce64a47af8bc07fa33c1407d6333297cfdf4fd2580e3f1f27fc4e8616efc4fbc5626 SHA512 ef6cbb25bbc59340296c69560e759670faa04045f01dfc5fd640069b708c6f84723cb048ded1d9a65c720141a27de991751ec81753f57478dd57225a91fed5ef
-EBUILD c21e-2.0.0.ebuild 413 BLAKE2B 91c3a6df024da53504fdfb267609d46e27c11a8328ae2388c13b98b5bc3ef50108141a2c0330de170b81b98a7b343b0fa86f93c5c814ce84fcd90fe8809aaa42 SHA512 6690b86b3c22c4f883529974c029ec71633a12ed1a2f2a0b90e23a6655dc64b4cfaf1d19bad664a07a194b9d970ddd2fa78a34ac2b026aa0870e1f4e351a6d73
+EBUILD c21e-2.0.0.ebuild 420 BLAKE2B e90087103fe3cc8b50020f6a322e0f83ea1515ccf96530fd728e12f8f48a5fd655f31ccb32bcc375ebf340c34349b8cb3c02350b6e65161993b63766c4b43cbb SHA512 af587f34b2ff75b26b884ce39750a396fcb0655c9a05258bb981fe0680a47e4d955cbb11d149db7109decf7a07968a61f54a915854e27b4536b4235a0bba8ab5
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/c21e/c21e-2.0.0.ebuild b/dev-ruby/c21e/c21e-2.0.0.ebuild
index 965c35068fb9..8db4c001c003 100644
--- a/dev-ruby/c21e/c21e-2.0.0.ebuild
+++ b/dev-ruby/c21e/c21e-2.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/capistrano/Manifest b/dev-ruby/capistrano/Manifest
index 8afa492d29fd..fdbed9494868 100644
--- a/dev-ruby/capistrano/Manifest
+++ b/dev-ruby/capistrano/Manifest
@@ -1,6 +1,8 @@
 AUX capistrano-2.15.5-sudo-cleanup.patch 656 BLAKE2B 06c0d83cf2b20337d7692ca3286a6ab8fb3797d67d81ee3498a5cd49f37d94458d19afda1eebc4904c5209809ab869087cd6568af1a4c89aba1b2a2826226fb5 SHA512 846f9c25b1c7806d082ec73faa2b5b9d4b6be285a33acf1d98dc36b9eddab54d664d915c3bab1da28fa2d86225fb1619fd746354cd605b8e3e8a5d0a05cfb96f
 DIST capistrano-2.15.5.gem 132096 BLAKE2B bbaa6bd482cf9bbe7aa01540aa5dab3f32401ffa1476d9057bb8ad420194f1ab2c32d8e744d7c982ebece5c4b5369133dc8378b7adf54c78732f9cb249db2a9e SHA512 10168080c7481ec6fc6f918ac90a3b1ce8f2b36f77411375e33cc915b02d5196ab061ac47e767edd724c82cffd1c2ad0a23ba1f0519cf1f2aae5b429167b19ff
 DIST capistrano-3.16.0.gem 69120 BLAKE2B 3e1c4f639c2d5cd36ae305746f53e68350d5eee39fbd5c5ec828ea5b69f47a3a5f8b4e6f4b65de2e24717f71cf4a9443879fc3d076474ab020e2023372085180 SHA512 ec5aa465065cd115f0a1b7db06b7c68f2034e81feb3b814b730a6aca464756e545fd5c065ea941a3076bb637448e2a0f04aeb56de2578cdf22a6f208d27a2219
+DIST capistrano-3.17.0.gem 69632 BLAKE2B 57430e8e73bddb11d170c579cae8b2fa6bd1390b5aaeb5e41a81a17ffb84d02623a4ca27c518b0d2ba16c78a639d34e05e68d1fad0d94afadecb846e7d515ea1 SHA512 d4298c1d71d51a3cb5216a23fb1181ba11f544a9572939b95f1f7fef80f64e6ebb2eb5cda4b22a77092ec0bb7d7aaa2d72eff88d715290cb989b78033d6053e5
 EBUILD capistrano-2.15.5-r3.ebuild 1242 BLAKE2B 844be23d3f0cb937c4abda2aad1789096462a24b3b68c41e0a593809f0eb8c20330a7ce31ee1484e00592a6d7b94752a5b911f278e3080c6b9f10997eede3947 SHA512 3aaedc46b4633aff5a29f178e030d9b55f01189dba8e6019f082694f0aeedf7b11f78c5c9b9c90d346145413a1865c8df59e97ca75a968b6db06040d66035bfe
 EBUILD capistrano-3.16.0.ebuild 925 BLAKE2B bc050c047edfae2e35d848149c247626aab342d588798355d85ec1cb17b60aaa0fc015468a0ad0c1d8264db412e6c963592aabbdef393ff5e0e218efd9e614a2 SHA512 3ec663167b9bab9dfef3cf44ffe55b3ee210d1e8f4bbbfef339211016993183167af5c13b5af13ef3fb987c7b735a629c358d8249f4ae4d4ba6a9070d0fb6215
+EBUILD capistrano-3.17.0.ebuild 926 BLAKE2B dbd96f5f51179cc81d891327b4892e42a514a968c7d6d5a7d6d6de438aece07d645f57bc4d2e5874b9a10f93d9e2b94bde9f6987d4d4b182d162f5d90f9fdd61 SHA512 0505cd440669002ef853f492d00eaed7f79de8644c66e55b9ead5f51b9e4f1c7eff73fc1f8236578083a953678ebb02b0e87c3c2c7a256ee78d76a934096ea4d
 MISC metadata.xml 396 BLAKE2B d27f0009de40add27cbe4a8a668ac4a82fa98eef30d794c61add8ad293db7e6b76c948499646c1dc23046cd4d88cfb36b41c1c14ebf78316ba6a4547493edb87 SHA512 98a3ccc2e6734e249cfb13754015cbd79485d20bc018312f7ff8500fa3c011db88c3955990a97da714dc6af7a6c94196057839eb76fd1612f30dba9e623ee0a6
diff --git a/dev-ruby/capistrano/capistrano-3.17.0.ebuild b/dev-ruby/capistrano/capistrano-3.17.0.ebuild
new file mode 100644
index 000000000000..687c83bef12a
--- /dev/null
+++ b/dev-ruby/capistrano/capistrano-3.17.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A distributed application deployment system"
+HOMEPAGE="https://capistranorb.com/"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/airbrussh-1.0.0
+	>=dev-ruby/sshkit-1.9:0
+	>=dev-ruby/rake-10.0.0
+	dev-ruby/i18n:*"
+ruby_add_bdepend "
+	test? (	dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	# Avoid specs that depend on capistrano already being installed
+	rm -f spec/lib/capistrano/doctor/gems_doctor_spec.rb || die
+
+	# Avoid specs that require a TTY
+	sed -i -e '/asking for a variable/,/^  end/ s:^:#:' spec/integration/dsl_spec.rb || die
+	rm -f spec/lib/capistrano/configuration/question_spec.rb || die
+}
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index ec16b9fc45c8..871f0b37f97a 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,5 +1,5 @@
 DIST capybara-3.35.3.gem 371712 BLAKE2B e50c892897cf2838cafb77cb7cfcb54e5fc52c3cdaf11489b60168511f3a213d2ad7f94c67ad236e6177b849f99445733aa4de9691755011bd32f524e5c440b3 SHA512 90507b2254fdd7aff375a305c1112b878d5f0a7c909e7d95b62c6728acc340f73d244304efc07c3dcc707825afcd9b23b088e5d889717efe4edc2dab4dd38d2a
 DIST capybara-3.36.0.gem 374272 BLAKE2B 51579941b95ab317fa0f7d9a21d3ad40a130a60c457f9a5d9921dac5b17bb339a423a21aa16d350da57602b22b0001c6ed2b1b5b038bb16cf56d268bd5a38ead SHA512 7ffc9d3e4058b08acd1cb223eb0313112354783cc4464f8f0747561caa45425f8623be7052f331677a66a7b9f5e645e48ae0118fe78c2d185408e5279e66f169
 EBUILD capybara-3.35.3.ebuild 1833 BLAKE2B 5b8dfe1dc852eb6d4ce3ed2d1bae46bb00b1e1de163f578474dd4652c2eb2a856895ad5af9928f111cc7583504fe29786df27e79aef95b401061382282556f97 SHA512 0d3cdedacdb1e0611b45859cc76f2aa06be1d2f61b932c6e63c860b048f05b4ed408c797126fa296a811834e2fe66d1b3876c08df72aac21c33b46f9f1c09e12
-EBUILD capybara-3.36.0.ebuild 1892 BLAKE2B 7947deb07a07d9b586bea346b75d00d3b8063670ec10713b48f393227f02f127ed144ee31f0b30040407ef00860de8aa18cd90dcfcc3b62577642b13d46375ba SHA512 58427ae17da86eb2259602e25787d9539be8ae8d68594900433c75781d57a4c7ee10f612553b0de4072d82bd1e35f2828de10bf14dcd6e34c52f1e7b5f6a53d6
+EBUILD capybara-3.36.0.ebuild 1891 BLAKE2B 0f29566d7d89a89eede7ac8efc82095e16d29498b22d7ca0150ac1e2e29ce117183f193add5888073bc66b943870ba2a700f7939b3bd422aa175325378fc0955 SHA512 c583ba58e03ffb442670616c93be20d40249edd7de873cf6b46c1565c3fc1b1666642d14dbd6a15fc7399c598989b54307e8e32263fc7b9a0feb88dad4b533ae
 MISC metadata.xml 344 BLAKE2B cc8fd629cca0ed4f66836cefd43f13a45baa7bb13d157fa7f90c61cdd4a12d71ef773ef9daa8dc6e5b07dcadd1b52a258995136a0792ec1870eb93fbb90cd61d SHA512 dae769c0ee80ebfdbd8b86b471fc13c3ac656bf556e554d3d5ce80108f6f6ab79dfe7a54f51b78af3d29f22807fa5ac5be48bfcf8655c60309bef7e3f80cea5d
diff --git a/dev-ruby/capybara/capybara-3.36.0.ebuild b/dev-ruby/capybara/capybara-3.36.0.ebuild
index 3a96df44af06..36fc914f1929 100644
--- a/dev-ruby/capybara/capybara-3.36.0.ebuild
+++ b/dev-ruby/capybara/capybara-3.36.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Capybara aims to simplify the process of integration testing Rack a
 HOMEPAGE="https://github.com/jnicklas/capybara"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 SLOT="3"
 IUSE="test"
 
diff --git a/dev-ruby/charlock_holmes/Manifest b/dev-ruby/charlock_holmes/Manifest
index 1f43597d1ccf..c23a3f3f8bc5 100644
--- a/dev-ruby/charlock_holmes/Manifest
+++ b/dev-ruby/charlock_holmes/Manifest
@@ -1,3 +1,3 @@
 DIST charlock_holmes-0.7.7.tar.gz 1192739 BLAKE2B f057a0b53f8624f12029679c96be754e9225bdeaab4db8077ab8b48c1e04883ea6a9a3019cc0c5d875179b287ef0d70aae591201d8c22c2a6e4a5b4d6c592294 SHA512 5950db982fbbcf41c6c8f893b2d5e1d755ec85e55bd6ce9072507c06925251edb3198840fdf346e8b74f06f4dc1d63bf94657ce582b78947751d20980f71aa8e
-EBUILD charlock_holmes-0.7.7-r1.ebuild 986 BLAKE2B 9278c5a85a986a9cc2ac653292267155915995e7bf65f61c68d323f45fb2dae411dcf57a8060c42ca3da837e107d21e6cf9a6d045204a8482bb2fcbe712e54d1 SHA512 dd56ea163a435967f9326e1811cba5f4295e20e73531efb7f2b90ba7f553fa22718a28443fa473ffc646d1a71b838ac2d52b2b70f68681b83379a02c6f3c19ec
+EBUILD charlock_holmes-0.7.7-r1.ebuild 993 BLAKE2B fa2e51018b9a20d6c917915a99752473ddcdf75967fc1936bb1c70815f15bca0bf0e915d44fcc88e7c8a8820aca73fbe2688a6eda400925b865168a74b37692f SHA512 9cce993adb656921d8c06eb4bab4bb9799eb37af59df20a0d3626b49a2707313047f685c777011ae9f0f3bbfeda0de513534ec9fec5d8d49d6dfa8eb3f8d106e
 MISC metadata.xml 353 BLAKE2B eae222f98b7bf2aaf0e55ab65941125fe64a9d9acf104da1fcb14c267254d25eadcb47738fea0f4a38f5eeb5d4c6b2d3728d46986f96c5a85794828688938d22 SHA512 6d075bb4e4e1702f6afb9278c149a19775f71b3b07b3adeeaf963739dfc0c6540d2144714f9395d9bccd588431b6df185ab87cd270c844b254106c1a83633769
diff --git a/dev-ruby/charlock_holmes/charlock_holmes-0.7.7-r1.ebuild b/dev-ruby/charlock_holmes/charlock_holmes-0.7.7-r1.ebuild
index b3f5ce0bc07d..c397ff037089 100644
--- a/dev-ruby/charlock_holmes/charlock_holmes-0.7.7-r1.ebuild
+++ b/dev-ruby/charlock_holmes/charlock_holmes-0.7.7-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/childprocess/Manifest b/dev-ruby/childprocess/Manifest
index 7392b611df06..a16c908f36b1 100644
--- a/dev-ruby/childprocess/Manifest
+++ b/dev-ruby/childprocess/Manifest
@@ -1,7 +1,3 @@
-DIST childprocess-3.0.0.gem 33792 BLAKE2B 7927e29efdff3fe5ad26fdf8ff5d55328412c89d442d3ad34fd44b642a91edf5cde3a271f2f7929a6365a3a740212f3f1364867ecec09c0d5c3846466922cf82 SHA512 56aa9303f1a88d57d0928f9c7177291a115736a5989e30bdabfb0b7fa1e6b02e42e45bf5e0498efc5ab9bb5f58a44004ed56bda61d95ca9a8d8df156b9f30ada
-DIST childprocess-4.0.0.gem 34304 BLAKE2B f27188ae722a8a3fd1279916f8f364365778053dd3c9fe2510abe35d60df4be430c9988ba5575acb1864f55c4c9130cb300328f0915d808e1760ec2b3bd7350c SHA512 89ea5f9d437ac2e5d246fc849002a5d14fba2907b5055cbf12a7ec89545bc3daa531dcc0217ebc7a7d88ee21798e2886a899679f6d25f2e664390752ab32dbe2
 DIST childprocess-4.1.0.gem 34304 BLAKE2B 81ca075bde9705eed57c80b0d37e1d8fcf3938bd0319a40f2178dab9be08cba570d90cc5292d585b3911eca5a90b4ff861d1fc79ba487d1a4f08b0fbd9a78c48 SHA512 e635c3acfa5ad85891c3879f240c7e96d47d7d5ec3f472f4ce6661552b0fb7bd72c5e3b9fb73f4f9312b749fbe554b4be388e56a31a3c63c39743d055d774def
-EBUILD childprocess-3.0.0.ebuild 939 BLAKE2B 2f6889a9eb8d9c66ec905a6a1b85d6d2934bf73e8b3950cbbe084ae59e371c39fc9453f52df7d307e868fedfcba37efff04ad723abd4f7841b939d28461d4a82 SHA512 a36d33da58a4503c804101095d0906abb378bcb69e1286aa464fc353322f367cf964947368c6fe919af5055cddd918bde6755d1bdc2ad7ee851029b156e1214a
-EBUILD childprocess-4.0.0.ebuild 1033 BLAKE2B 93612f7a02ec27144de1d30ebe87859c0047bb1fffad1fe44407adb63ee3e16c5d4134295ede7ece49c3ec213a8b0ad3f62dbfad02cf84f39ad6ab0c6c97d4ab SHA512 daeb97e68276be1d4c3de87d1cf1ee2c2eb0fa7bbf03ab9ace6817bde8bccc7481d9fcfef4b25267f32e9f0ccb986568c272e913e756938092b7a79f1478ac60
 EBUILD childprocess-4.1.0.ebuild 1033 BLAKE2B f7257217c45ddab349c26c7111a91fec2e79e398a932e49c65d057e24b883d8f3156484616363154e8bd49e3a2ad95dda86038eeb94c9d317c92563b2b2e7b4f SHA512 12fc266637a1f323d4690057d55e2f8ad51f2c70446e5520ec8ec6a31423f76077563ef656eb6a8241eb0a53a389af2e34a086832b18e1a861157147e37b8d0a
 MISC metadata.xml 345 BLAKE2B 6c1e132dd9debd6a0f3a3da070ca48f1cbdfa8b091e4f7a686406552b27ea938d9e97e23b5311a93666aab8bfa90ec629c5a622fba67bbb85523dc06af38a5fb SHA512 c39abef104e244da843db9d772211e68a47739dc64d939d7e99d031b1fcad7a50da19c68dca4095c30069e0aab9f7a60750ae470c15347e21d2f9056f08e58bf
diff --git a/dev-ruby/childprocess/childprocess-3.0.0.ebuild b/dev-ruby/childprocess/childprocess-3.0.0.ebuild
deleted file mode 100644
index 8ab0dffa83b8..000000000000
--- a/dev-ruby/childprocess/childprocess-3.0.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Solution for controlling external programs running in the background"
-HOMEPAGE="https://github.com/jarib/childprocess"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/ffi-1.0.11"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	rm Gemfile || die
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	sed -i -e "/[Cc]overalls/d" spec/spec_helper.rb || die
-	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
-	sed -i -e "s:'ruby':'"${RUBY}"':" spec/childprocess_spec.rb || die
-}
-
-each_ruby_test() {
-	RUBYLIB=lib RSPEC_VERSION=3 ruby-ng_rspec
-}
diff --git a/dev-ruby/childprocess/childprocess-4.0.0.ebuild b/dev-ruby/childprocess/childprocess-4.0.0.ebuild
deleted file mode 100644
index 296f3f0a6e54..000000000000
--- a/dev-ruby/childprocess/childprocess-4.0.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Solution for controlling external programs running in the background"
-HOMEPAGE="https://github.com/jarib/childprocess"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/ffi-1.0.11"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	rm Gemfile || die
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	sed -i -e "/[Cc]overalls/d" spec/spec_helper.rb || die
-	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
-	sed -i -e "s:'ruby':'"${RUBY}"':" spec/childprocess_spec.rb spec/spec_helper.rb || die
-	sed -i -e '/system/ s:ruby:'${RUBY}':' spec/spec_helper.rb || die
-}
-
-each_ruby_test() {
-	RUBYLIB=lib RSPEC_VERSION=3 ruby-ng_rspec
-}
diff --git a/dev-ruby/climate_control/Manifest b/dev-ruby/climate_control/Manifest
index a6c6e2925a00..724ae21fe261 100644
--- a/dev-ruby/climate_control/Manifest
+++ b/dev-ruby/climate_control/Manifest
@@ -1,3 +1,5 @@
 DIST climate_control-0.2.0.gem 9728 BLAKE2B 9868eef8836189d7567d8fd8f5dade874ed4baef883f38b2d6148bde4f1e24544f31fae75ff7bcec4dc685c1fdd23d5164817460eeaf151d8eb105e023bbd741 SHA512 c264d731fb02c7a15932d2724bcd54dff91d2370a0b5336444e167e0d39596974c3826db502be7dc1b6d99cdbbc022135822222a5a6cb6b822aa32a0913c1ec9
+DIST climate_control-1.0.1.gem 9728 BLAKE2B f2d267e86c58fdbb7a85508f56a091166809d108c2e66702df50962086a89a134e6a47a1e53c36272c563f1d4a0225fc613490616d67fbe04e9647b7fe8cfda6 SHA512 2dfd790b444409275571881d19c3712c6542890499f3d55e5f8ea3775166c01adbb216a0749b0c4e126d631cba690c0edc3f8c49143fc0ff3bcc8b25545bf218
 EBUILD climate_control-0.2.0.ebuild 654 BLAKE2B 82f8da5eb9baceed06080311e8d868770d97a9a1c9622a17e82bae44d60f58238188b67dac7df2d76f270504456c97374c5f462dab838db0bea02cc19b7c6c36 SHA512 0650b4e987f2131369493e8ccd65817a6a73ce6a9a2884edecaf872beab69f5bbea5a7c7cb4801f8cb10cbf29f9d93f38b40a35560a9b3cfc240eca5dc016a25
+EBUILD climate_control-1.0.1.ebuild 667 BLAKE2B 0b3cdf28086058ed66460d8a29cfc21b57f19de9fa900a1dfa16dc8e40c6d91a8b39f807bfcfc95c8be1a641d66572365f83cfd0f885f046919133b009a60e53 SHA512 c24b32678f574dfa64c8ac1edc513624fa2586aafe1270a2fc8181d4c43678edbc60229f0132704cdf9cd5b5ec6144561d348fa64f25471e685640a458dcf6a0
 MISC metadata.xml 353 BLAKE2B cf312c36f2d8076cfd604113e542eafa044972d799f7ace6b3d142e668191d9b9a9e2b768f0be7b359d4c729f4d47a4b2067a72998e9f2aea37530515aa4aaa1 SHA512 a886da2546baa1ade602d8970ec40e6163ef78f1e2c9f1b5cbab20d824aebebef7264e249af1f730fb67f5834e0dd6781c9bc8919e7992abd2e05eb86986eeb3
diff --git a/dev-ruby/climate_control/climate_control-1.0.1.ebuild b/dev-ruby/climate_control/climate_control-1.0.1.ebuild
new file mode 100644
index 000000000000..afca40f5eb3b
--- /dev/null
+++ b/dev-ruby/climate_control/climate_control-1.0.1.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_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="NEWS README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Easily manage your environment"
+HOMEPAGE="https://github.com/thoughtbot/climate_control"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	# Avoid dependencies on simplecov and git.
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+	sed -i -e 's/git ls-files/find * -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/cmdparse/Manifest b/dev-ruby/cmdparse/Manifest
index ad30954afbce..5ef769db1b6c 100644
--- a/dev-ruby/cmdparse/Manifest
+++ b/dev-ruby/cmdparse/Manifest
@@ -1,4 +1,3 @@
 DIST cmdparse-3.0.7.gem 54784 BLAKE2B 2ce8b26b362ed78cd6e5ecc1d678c32a6065dc38c402e82f6715ee2bd834c49bcca2ec93d2dd11d2ae2ac809068efa4fe640f98f367c4278da6d0cccae094222 SHA512 5ee929c9aaf6254686a916fa11e4f4809693434f2cff7ad5e14aef2b1a95bfcd2e818afc0e4337616836971a85c980b76e89bbe61f6be250c372ec0587dc58b0
 EBUILD cmdparse-3.0.7-r1.ebuild 437 BLAKE2B bf094b22fe3e87a8273f29849a81693acb7e3c8c3c29aa82098ab1ca0626464360d179b4e54c6d2445282dc2ce0c764dc1f2eb66892dd2f1774b67c94bdf902b SHA512 ccad5ee91b7c93606ea810687233fc6ac0edeead25d31d32eaef1c74b31859bf99a6f57c348b6633c96ef4104044b18ec4d4e0c4527acebf1b9871e0377d71f3
-EBUILD cmdparse-3.0.7.ebuild 430 BLAKE2B 64aa5bd61bbf0c9a2e6ddb5c44fe424a421e8036c6c337b5ecb92bb572cccf614589ab682f1fa2d9bab21c8e6f54b5a56aa4cc53c7397bee05734a520fa5fab9 SHA512 f6cb2f64535a6d26454f494c7f54470290d4c65dbc6c69dc057db00a40210275b8830d6706622668beae8bec3d793e39a8872e819ba3ba6bac87b89acef85d2e
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/cmdparse/cmdparse-3.0.7.ebuild b/dev-ruby/cmdparse/cmdparse-3.0.7.ebuild
deleted file mode 100644
index 1c3fbb262809..000000000000
--- a/dev-ruby/cmdparse/cmdparse-3.0.7.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-IUSE=""
-
-DESCRIPTION="Advanced command line parser supporting commands"
-HOMEPAGE="https://cmdparse.gettalong.org/"
-
-KEYWORDS="~amd64 ~ppc64 ~x86"
-LICENSE="MIT"
-SLOT="3"
diff --git a/dev-ruby/color/Manifest b/dev-ruby/color/Manifest
index fb9a270eb5f1..af851765a003 100644
--- a/dev-ruby/color/Manifest
+++ b/dev-ruby/color/Manifest
@@ -1,3 +1,3 @@
 DIST color-1.8.tar.gz 42530 BLAKE2B 4a0f0ff4d4f82530fab5bad345350ea0cd983bc7d1bd8898c8a4da16de788efc908cff919d622ce0a9c445257e1dfef0adda4b29641d3eda55d0a8c917db932f SHA512 be48a8895b5dd33326a9debe250c87df37025eb2dca05a0eb61b82b31dbc1ee27c175fc1e37262bce88729e882dfb66f449a3a29c76b9ef0ac2064ffa2b4266c
-EBUILD color-1.8-r1.ebuild 648 BLAKE2B 0784d15b02d3b909a3d98af5680c5709b95ce0c3d7fcae35aa72e28ead236f44f565c3a766d807b5363540b483844d84e89ce4abda27ca593943e677d22c8f30 SHA512 acd85ed9cc71a75606771ed79f237a6925765e52492ec430060c2002aa7e92ec60ea7c5256524da7197b79c9906475f50c99e37b2c52adbaee6d97874769c5d8
+EBUILD color-1.8-r1.ebuild 655 BLAKE2B b338ff34aebf9c038a2d7cab2a7f081d65e018436a6d1a4d68e52b47f22665b33a78141ca2e6b56f34aa5829992dce20e76d547cd6b444656540f54c93df92e5 SHA512 43b00812ba3ce4ab067acc96f3a9279a83106ea2bce3830ef740b1e28fa3844c734f2533acc9885129d4a537eeba265f9961226aaf7d4b89196380707da44e9b
 MISC metadata.xml 343 BLAKE2B 59004534581e85a3babfbbe1266e0b1f03521a9d162fb0394b6cc42d202e2cb0af484425553c322b4aec461e6ae231890092c03b140e4242f0bcf7ea748d9a0e SHA512 810c9bbf27ebc5a25850534b2d28b3048c8b8a38230bd734b8882bac93023e25660e1a5871abaca4f1580104cba5037c40bd291f24bef94c293c3295099b83a0
diff --git a/dev-ruby/color/color-1.8-r1.ebuild b/dev-ruby/color/color-1.8-r1.ebuild
index 3cd0aea63b82..43c9bfaf760e 100644
--- a/dev-ruby/color/color-1.8-r1.ebuild
+++ b/dev-ruby/color/color-1.8-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
 RUBY_FAKEGEM_GEMSPEC="color.gemspec"
diff --git a/dev-ruby/colorator/Manifest b/dev-ruby/colorator/Manifest
index 25c667a53f81..f45c75f597cc 100644
--- a/dev-ruby/colorator/Manifest
+++ b/dev-ruby/colorator/Manifest
@@ -1,3 +1,3 @@
 DIST colorator-1.1.0.tar.gz 5112 BLAKE2B 89c297ad2de64b4befd0e0f5b8b4fed07c9456fc1e013d70f3084e15e8392b8e319737eaf9eb9172e4b5a32a36039b096f754de2351ae4f5b68f0f1884230f55 SHA512 7bc2e85f8c4db8ca6db5140c9ebb471d3b1733c1c408595eb0bec531ec5f08fc86f4ee793a451bf51f359c8d4f07beac9e5ae9f418e2752be1c4fb0442b802de
-EBUILD colorator-1.1.0-r1.ebuild 716 BLAKE2B 11b04dc1ee1ceaf2979edd5994172b903704a37055a031ca9d04ae73abfd6384dd3f172aa94a92bc06e8ef8e1fd046ea36c14b396cdcc5c6823d0d08d932ab85 SHA512 f54068f67a31dfa734c35211520310c9462b9f30a27645f892ed54e9e70abd7a2acc36fa02d4ef1af0ff3573c34617fc9e0913f99fc1db191e60e254fe359c6a
+EBUILD colorator-1.1.0-r1.ebuild 723 BLAKE2B bc75fe95f69c09df03a70c6758c5adb12b8de8d5d2b0f8502b386d24e8c15aadf9abfc0d7d8481ba8803d38cb53ebfc289b07c4d9578f06b9a785c1021f1d4d8 SHA512 5f723e4707a1c960f46ba8c00e9cc85c4f7d4d85e314e74d5719adfd36c4975d0bb13fb102246eec3f09b3a525996a23ba05a73b1b0639df316f7d0209cdc84f
 MISC metadata.xml 346 BLAKE2B 5cf1cb7ed2ce1730d9bfe039c501cd35b476184276892db83d23d3f08065ee8eb4d4f8048ed502d77cf78542d3784a0cfbf9cd66ca74c503b9168fcd996f6b64 SHA512 b827f181e3750eae3bad4b424904eb470dc5b07aa61a90b5cc2e3ac68fe106b5756e9580ce94ce20a012f8b4c97ff42a7f076cf59ced5b4690c9f1591e926b7b
diff --git a/dev-ruby/colorator/colorator-1.1.0-r1.ebuild b/dev-ruby/colorator/colorator-1.1.0-r1.ebuild
index 51126d3d1003..e634550f7885 100644
--- a/dev-ruby/colorator/colorator-1.1.0-r1.ebuild
+++ b/dev-ruby/colorator/colorator-1.1.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.markdown"
 RUBY_FAKEGEM_GEMSPEC="colorator.gemspec"
diff --git a/dev-ruby/colored/Manifest b/dev-ruby/colored/Manifest
index cbf69ce90a80..e4f2625648ef 100644
--- a/dev-ruby/colored/Manifest
+++ b/dev-ruby/colored/Manifest
@@ -1,3 +1,3 @@
 DIST colored-1.2.gem 5632 BLAKE2B cb384fe13692d453f86e403a8684604d07543e3ea3270ad15b6d6d8be2c0d3610911a23b82f23c40e0472f40174a290948804eeb8cf5c496f36ab49d56ee4413 SHA512 92a50ba1c434b6a0b409e546812ae6f4331be00a68725cd207504bdd65c9512f4fc3bf83057dd4fad09b8a3e5869595a6bb572c4303f0bef1f241ce63d4fc90b
-EBUILD colored-1.2-r1.ebuild 372 BLAKE2B c3afa7e7f258b93813d07f16eb9696125e4a20edcdbbfe1307d9730918d9bc7f9b1b0af9fd9929399fea256258982650bdc4113d994ffe7b365eb912fb9eba3b SHA512 a636846d06143267d8e84253badf45bfeae81fa9c5728bb2605362bd0cb93a3d75bddf88e488a2a3cc5027fd915dc115bdb311922f3a2ded956a3bbcd237b8df
+EBUILD colored-1.2-r1.ebuild 379 BLAKE2B 5426c980bd1776b4ae8f52460d77b1cd5a497f8953ad4e1f69929d9ecca9f603783a20509bc07c6130679fb462ef40dbf8a398c6da9b21b7e4ed5e45de566956 SHA512 6df9dd31d706ca4876bcc226ba37d5fff2e3bfde4119c573cce6a8f4149e1d20dfe0538671f6712b305a99c6faed6ca4784b25532cc46ea6d114f177c11081e9
 MISC metadata.xml 342 BLAKE2B dc673388fe81a59c0811d8456c7618e3fbf72639c050e33204279ddce9cf00da4df0d59857c594f8dd005d951c43e9c46ca62339dfff2ab5c52dcc50c1714256 SHA512 7374591f0a9a2b225fad85944ba903bcebcc0824074678fda64be5d1358a772a3891665a17cb54568ccee4a25ae2df842b2d4f27e8323d294e00c203a00cd2c2
diff --git a/dev-ruby/colored/colored-1.2-r1.ebuild b/dev-ruby/colored/colored-1.2-r1.ebuild
index 2d33a155d46a..0c0e2d8559a2 100644
--- a/dev-ruby/colored/colored-1.2-r1.ebuild
+++ b/dev-ruby/colored/colored-1.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 inherit ruby-fakegem
 
diff --git a/dev-ruby/colored2/Manifest b/dev-ruby/colored2/Manifest
index 31212a879ca1..a2ad65abcb0a 100644
--- a/dev-ruby/colored2/Manifest
+++ b/dev-ruby/colored2/Manifest
@@ -1,3 +1,3 @@
 DIST colored2-3.1.2.gem 10240 BLAKE2B 6dbf0dd1bce8712fecb4f34b0f4480da21f97db6d5d002e1758a7131120bbd68c02588b2f05eb50b09aaf2f398761e6d281b49b2b7a021724b7f4a416ae9d2d1 SHA512 20a3d610e7ff4097129eebf8d5f6cd5618cd5763dc14ad97c2570047c4f75ff371d3bea1b528f8c1b806b102e13834fd0092f9ae50590f11e70157e4584b915b
-EBUILD colored2-3.1.2.ebuild 474 BLAKE2B edf9e848dec6af228f962f7a3118db05354e26dd89a381362558ca81e5df0c8756b79936cf772aeb81a78cd03e22331a1cd79609fbcf2bcd9557e71ecd4505ca SHA512 bef85ccc984ac30d548df798cb1d2d696c0c46b918d899f4a93213989fbc20c9ecfbf8baec12263ea4d6fdc7451bdccae53bbf7b26a09a7ed3d61fbd9ddb3cc1
+EBUILD colored2-3.1.2.ebuild 474 BLAKE2B 88524418264fba540c03d0e892c2204c3bc677686527e7a00c96aa5df9c20ddd326ed4198134aadaa240957e1102807cd56e45c80c7e62e90bac5bdf198ca51b SHA512 71220062c0edc31e6a5f0d80b785653b7ee77393c8fcb55439604238b02a011aee9329aaef6a5d5020686fc98bc8ce2b56d0cd85ca75ef65d12e992b26e5f8bf
 MISC metadata.xml 343 BLAKE2B 114b0286eb61ba51b6d6ea9489117379287c61aaa7d5bafcc0c1c15cbcbeb935582cdbc196fcb3485a5bfa56a5e078925ca16d634434651c6c1a03452f785c95 SHA512 242b2e1d4818082f6b82a73a70ba5b3df10a7af33b2f915356a8c5bd67b25848a534b37048fe4b4c86bc63d3b95f279a1c9154a657ede945d109ae839f1b937b
diff --git a/dev-ruby/colored2/colored2-3.1.2.ebuild b/dev-ruby/colored2/colored2-3.1.2.ebuild
index 5a158dea39ff..935065681ac8 100644
--- a/dev-ruby/colored2/colored2-3.1.2.ebuild
+++ b/dev-ruby/colored2/colored2-3.1.2.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
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/colorize/Manifest b/dev-ruby/colorize/Manifest
index dd14d7742530..19e67cc88bb0 100644
--- a/dev-ruby/colorize/Manifest
+++ b/dev-ruby/colorize/Manifest
@@ -1,3 +1,3 @@
 DIST colorize-0.8.1.gem 15872 BLAKE2B fe8e3a3e010d55954fb9e3e26626202e1d3eba5478e27009fc86bd4029c98fe5a2ed2f2b0d5d1615e892435554272a70c1cbfcdadadea8bcaab894cb290e7992 SHA512 0819dfaa94150c85cbe633c77006f2f4bdd6c4f9bf9dfa954b8c4038b8a680c99a2b4b160da05bf426402d287a0db4c4eb1cc66a949405188b632f39da381c72
-EBUILD colorize-0.8.1-r1.ebuild 620 BLAKE2B fcd76ab62919fa7496892a4d0dff395b3aa5ebc7055a201ac390e8f5299e892d659a54d3b5c4b7fd1b88820eb1521bcfa053b0cc26ade8fa54d3d909fe5d824c SHA512 900766be07fc77ea35ceacc13d530f41c5c415c676634c5d07fa02f8c9dc59c6e2032ff2c55faf1a9f6aa94ccf0c6062eee57eb00c4be820e387c6148842c250
+EBUILD colorize-0.8.1-r1.ebuild 620 BLAKE2B 2f53fa6ead93064bd0b2d2b7476904d984fb1c47ba1012f93aa77e22d0f778ea388693105cb0fc532efd5842a7dd44dc5916c31e17bb32cd5fb0be1d88522002 SHA512 98fa4639afc4460f930b63bc2405b55d5b79d0533f2c8fa1ad4888268af8a1060071684c9aad036ad3c4f6c37d789962f276e4963124b2c1086018a221639b51
 MISC metadata.xml 344 BLAKE2B 5262445ecd7094595496227408c33e21782ec5e216fc9bb9c8e457b3bc30f93435d31beb84a6eefd6058cea8d4bf34cad7d2a88abd84396d585b5f1ee282f8ea SHA512 afb66a90e485bc54295f83d4fb25c66ed5bff62ce95949ffe6fcb5cdfeb28298738f4e88e3a8c7499d491968100119fc2e38120340c86a40902504f6ead99890
diff --git a/dev-ruby/colorize/colorize-0.8.1-r1.ebuild b/dev-ruby/colorize/colorize-0.8.1-r1.ebuild
index 9cf49b11f5e7..17c7662c97f0 100644
--- a/dev-ruby/colorize/colorize-0.8.1-r1.ebuild
+++ b/dev-ruby/colorize/colorize-0.8.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
 
diff --git a/dev-ruby/columnize/Manifest b/dev-ruby/columnize/Manifest
index 1bbef316734f..493c0301e1d1 100644
--- a/dev-ruby/columnize/Manifest
+++ b/dev-ruby/columnize/Manifest
@@ -1,3 +1,3 @@
 DIST columnize-0.9.0.gem 16896 BLAKE2B 46821b72e3c0b70b5788002904fe6079dbab28f9f5d085ac269de8b2765c00f22294bbb36a288ea5688baf3a0bfeed9a4edfbe78eb41be67321433032ec99811 SHA512 b85f478db0e70740ff2d09e0c0a0e6eef378cbd0f025f8583726619412c0dd93ce85705978550ed13713f35e90db846ff087110c210742dfc3223bac3da7176c
-EBUILD columnize-0.9.0-r1.ebuild 445 BLAKE2B 4b31c16bdff907aedd589e1536885201d09f88042032b1ceaf781d2b4666bc7796722938d241dc588fd5dda92f64469c7976d4be1f5dd00b9dd5aa7356e34ea6 SHA512 201abcdbcbe83ee6ead977354757180a459f24b58606795a4ddc5a525519c9f112c38c86bd9e94a9269cc7103cc7147b4ab6b939699454d83a91a4cb34517d4e
+EBUILD columnize-0.9.0-r1.ebuild 445 BLAKE2B 102917231be683a20b8f76d3b7aa4c96756653f3326e4895f2390279ae2b7de3a35a51e6b868d9703b6451e7755103fd01bb931b64d37ea0163371c635b7f56d SHA512 a01ce8a92b887606164267478344061015cb026b9d10c9bde8014daba6dc94f965b8834cc4ccb5a303f00bcb324c6dc262421347377fde28080ba1d7e0cb0e83
 MISC metadata.xml 342 BLAKE2B 2ea1721becba00103210456b83ce0fc7d0e7584dcd61a21325ed1255430eaa3aa10498c1e551c12c6018e44c85b05931351e87b89c342d95b05d6d9595e5b810 SHA512 a17db116d5836fe555a8acb5fa2689cc9954e99fcf60e83dcc81712832b2aa96743dfd0daa6d0621d2bb206a30379f01d88aa4fcc5192807e83ec8dde13035da
diff --git a/dev-ruby/columnize/columnize-0.9.0-r1.ebuild b/dev-ruby/columnize/columnize-0.9.0-r1.ebuild
index 1307826334f7..61dc3cc6ac28 100644
--- a/dev-ruby/columnize/columnize-0.9.0-r1.ebuild
+++ b/dev-ruby/columnize/columnize-0.9.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="AUTHORS ChangeLog NEWS README.md"
 
diff --git a/dev-ruby/commander/Manifest b/dev-ruby/commander/Manifest
index 5bd229cf129a..f2218178640a 100644
--- a/dev-ruby/commander/Manifest
+++ b/dev-ruby/commander/Manifest
@@ -1,5 +1,5 @@
 DIST commander-4.5.2.gem 37888 BLAKE2B e78e009a414e432d24a820dea6e85c9240e3a661eb15a17d71c152616dfd32fb02eea1e513a487ae90b8dc81e6ebc208d0bf432c37dc5a116c03c9df12ed057f SHA512 22ea0a5c88d4ec03658ca8e0fe12801a5a5918bc09031400e1cde2883bf061b85feb6d77448b256bc21f5ddee00e4afb2c08b99132cd7862f00c7cad13588564
 DIST commander-4.6.0.gem 38400 BLAKE2B c4adf5b58fe679378012a893526cb00ee71c4cda5686d397ee93aeb11dcf1b32a4aa8c4e6b77c2ed07af75bf2492da65591cf49b2e05a658e753e78a9a12736a SHA512 01e7d4076b6ff632f6852e15bf995033034a71d6320c5b3b41751e86894f5eca35b408311e757c555334d220a9a811a0d60c0fc993414961f1050d948cb9f5c7
 EBUILD commander-4.5.2.ebuild 558 BLAKE2B 1b9232e2bab5ed69eeac9597b6315ccd7846bee6772264a331603494d323ee2d701652e18bc5d97a89c8bb919342a74ebda8c44b452470662eba8d02ece00df5 SHA512 16b89db5ecbfb0de20454588338d0d0cca2e366b1c2e0da350f58487c8605c44c2dcd9ff33611ca20b52bff410c4134200c0eca499f7c19238383d6a7fcc515e
-EBUILD commander-4.6.0.ebuild 551 BLAKE2B ad3a42d4f10216176d440315b801bfe7aa4fe1a4b883ecd4e74217c5e69c703089119500d5f5e7074a9cf544877c74539a448ad0b23194acab1189346bb07cf6 SHA512 b94e0dcaa6a3f9f5c36fbb8fe9a3619ae91eee8e859d6ea666aae6dc0f96c420424518d6ba6cd2a0500862f0211af3663637825e9a7ad81b319ab350d6d74759
+EBUILD commander-4.6.0.ebuild 558 BLAKE2B 68646d6de9a8a043ff5dff5c992a47347a03bf93f446332898a5a72d14693719f1cce67e4f90575fedb6b0cac8237f14f593a5df76c457e691b8ed65627229bf SHA512 0e3991cd68e2254eed79e5456edb0cd2ff644a01fd78a5fbb9e4ecebfb5057bee81e49e46dfe88e0f1751c930d12bff3e42ae2972b30d14f7cb8d8111ebbd0e2
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/commander/commander-4.6.0.ebuild b/dev-ruby/commander/commander-4.6.0.ebuild
index 542600a4b740..38630ac5c726 100644
--- a/dev-ruby/commander/commander-4.6.0.ebuild
+++ b/dev-ruby/commander/commander-4.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="History.rdoc README.md"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/contracts/Manifest b/dev-ruby/contracts/Manifest
index d0ac43a3e7de..c0876ef16b7b 100644
--- a/dev-ruby/contracts/Manifest
+++ b/dev-ruby/contracts/Manifest
@@ -1,7 +1,5 @@
-DIST contracts-0.16.0.gem 55296 BLAKE2B 71b058fd2bcbdf5dfc2ff60631ecfc56cb405dea08fb5b2a67fb23c859a3941ed0aa3963ef639e9cb6670d871a6301a0c8b360fff3912413c10ad44ee8dcde2f SHA512 27d757c3a6d25920ada1b24842a5ed8521bc8902b1840b6060c94dc17e5eecb91501439eb764fa2fec97dedc6591d2c2978630f56d4b38e7b607e9fccfb60ad7
 DIST contracts-0.16.1.gem 57856 BLAKE2B 72978a2a47b75411d2ae74521470d5958ef711351e2ce6776f1331b0d3f4b175d43f991a73fd2332ac0e1f6732b05a65887054a0be4452fd62f058a28ba929be SHA512 bc182431de9efbc6d23603c68a64eddcd3f27ea1ac8c2c9ff00840cf38d2f58ba595304127e6b43e504d3aa387559a5c1429b671dadac175d3a4ad2c02edbf6a
 DIST contracts-0.17.gem 58368 BLAKE2B 2bccd3a552268821b3c34a08fef3d6c0e43e27f8a0e56a2b7b0291d388142a2efb3686230d4daaea6e82c45be8d42f2ab61d1aa3d6a7f682bd7d99a0af7f179d SHA512 bce1417e7b505ec35b43917d53cbdb175995ff877da2a6122e08b3c7e537d557785987a0110006525dd079f09d574be3f5f4793154f99ac91c32f83662fa311b
-EBUILD contracts-0.16.0.ebuild 517 BLAKE2B 072ccdc8151f17161d6a84da566e8bed9808c70f7ec4c29406f2450dd3a9bc8764c6581a92c2ff7f56c12dc4d14ee5b0ac54cdf23f2514d5e237d362bde8f96d SHA512 95269f78676dd3e3a6bcd504a676eeb13da6fc9ff0b259622883cd739167f9850ff73fb05cf416d1604a6b4eeb46d93450523b14e1f67fcaf9d556518f8a3c8a
 EBUILD contracts-0.16.1.ebuild 486 BLAKE2B 3f8a2fb9e263d24cb7a693a33f44122109e970fe3b86daef7b37baac32d10844a8041587a99f403516bb26416356941f640172c9e7162e4cb24faeb3a65e591f SHA512 eff26e68689a86985897f84578349e1c73c56d158a972fbc083e5191e0114f289d0f11535e00b965c9bc95b04300b3d484e8d78871d248fe1e4d94afa3e36e5c
-EBUILD contracts-0.17.ebuild 478 BLAKE2B ed95bc5a518d6c60afd52e9438db83ed9dc02cbc3a2d9659e80b74558a1e1eb5c67aa135dbbb07462980bb544a388ecb69563539a44d662bb77f0fce88c3c61a SHA512 fa692ed77a20fae79c8d84781a6e561078ccc5a7f39a397dab3ed2623cdb6745e595e5268bcc7c62df273f7a0208240a4310c4d8da34f4640f8336e64fa226db
+EBUILD contracts-0.17.ebuild 492 BLAKE2B fb26eb9db6d6a24bf92ae6f0116db1ea1643f8448efa76fcd95eb4162e659854696b2489eafc47f539748000de45fd81244137aa848442a0befeb0707d321b01 SHA512 19ec5f48bb51d1e04c5bdb54855d9ff50c4d61cb42be9506cd60f0c1af7eaff1875f2780b5f075b64ade68552eaad8e85a47e1750280ce28b03f4e435b76fae0
 MISC metadata.xml 353 BLAKE2B ec68a13b1faccc1cf044530138380700063502c1844fe5fd23c79717b15aaaebc7c0a65789b60c0bed1ebac36f87d4fbedf93374fe0fee300e5cb4fe81653838 SHA512 b03899010b43019e54ad01b3a160bd76cead6cb7e3cad3ab1ca0f1a63ce497ae7522530b01578de8d9de962061629d0453ae99154b4d97a90815df71b47f2466
diff --git a/dev-ruby/contracts/contracts-0.16.0.ebuild b/dev-ruby/contracts/contracts-0.16.0.ebuild
deleted file mode 100644
index cde566992069..000000000000
--- a/dev-ruby/contracts/contracts-0.16.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.markdown README.md TODO.markdown TUTORIAL.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="provides contracts for Ruby"
-HOMEPAGE="https://github.com/egonSchiele/contracts.ruby"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
diff --git a/dev-ruby/contracts/contracts-0.17.ebuild b/dev-ruby/contracts/contracts-0.17.ebuild
index cdcdf09d1eb8..3a0540c5fac5 100644
--- a/dev-ruby/contracts/contracts-0.17.ebuild
+++ b/dev-ruby/contracts/contracts-0.17.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby30"
+USE_RUBY="ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -15,5 +15,5 @@ HOMEPAGE="https://github.com/egonSchiele/contracts.ruby"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
diff --git a/dev-ruby/coolio/Manifest b/dev-ruby/coolio/Manifest
index 35ffad53c1ec..195b379237e6 100644
--- a/dev-ruby/coolio/Manifest
+++ b/dev-ruby/coolio/Manifest
@@ -1,3 +1,3 @@
 DIST cool.io-1.7.1.gem 112640 BLAKE2B 107d7541180de46c78542eab4b131220c4ae4a10210c7ff870f54eb24178b364fcac1abc4b93f8d0eccea197fb746cede95416aea8f3d5cc458626b1fa9a02f4 SHA512 9ab3e6ddd1689b2825f9bd82714b4ef5ac921dc4b2f84786971c3ec448577613cee73084c99090382878b0da43c9228cb2fd3a8627dc8f62ceeeff274dbdc929
-EBUILD coolio-1.7.1-r1.ebuild 1246 BLAKE2B 9ef7b959127bac1a709fd33d857824909bdfdb4a2c861060c03670818939f8d465676693b789732d239ecf0a5af7bb5e8240c2a9cd845655661e19606a045ba0 SHA512 47e72aec678cf545817d216a57b47ecc2ae97fc2aff3ac07fd79a2c9065311f12f230c63d4b882ed959a16082ed202e19582074248b1f217751a2edc34217bc6
+EBUILD coolio-1.7.1-r1.ebuild 1246 BLAKE2B 6ee674ffd5bc7b019ef5fed160ad3e77821f653d35e870ba1f6c32fef0246aa6615df4b34d2bf59478df55e0ce07b7af483b1347023e186461c31fe6920f6048 SHA512 68078fcb033d642033a1be86055bb6c23c5fcba59b4b3ce80c9a428682ff092224fba1d7e703a4cec673f05afa67e12258e5afa2aa048c5da417b908b4995de3
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/coolio/coolio-1.7.1-r1.ebuild b/dev-ruby/coolio/coolio-1.7.1-r1.ebuild
index b7f9b1eec0bd..717ae48c1ac0 100644
--- a/dev-ruby/coolio/coolio-1.7.1-r1.ebuild
+++ b/dev-ruby/coolio/coolio-1.7.1-r1.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
 
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
diff --git a/dev-ruby/countdownlatch/Manifest b/dev-ruby/countdownlatch/Manifest
index f9b7caf6a2ea..1835be12cf91 100644
--- a/dev-ruby/countdownlatch/Manifest
+++ b/dev-ruby/countdownlatch/Manifest
@@ -1,3 +1,3 @@
 DIST countdownlatch-1.0.0.gem 7168 BLAKE2B 5261ccfec2c743fb2bdd785bf48c1695ded01be94e0d216d96f2322d5422000450dd6205a0b7ad3597de665b0629f09369937c2ea7cc377dd700a5e233662327 SHA512 3e8e23212b253d6d29ae7834131e7dd5ccb40d6ecb43fe31fa84b8314e932b5ef1cc8ce61f59ba8256bfc80c6f7c131b149748e99ce9b4667f2da7ac8b8279a5
-EBUILD countdownlatch-1.0.0-r2.ebuild 574 BLAKE2B 5da5f1072af39c5467868115afa3630a3f1c0bc709195b10b06155847361ea753bf18b4f7600659ae5d4d23b306da990d4f1036703c6d1f77d254e63d9621f78 SHA512 97bfb46742bbadd11e9bfffec49e8e274a307fc053dbfd9c3ca5687eb8fce21867a7792c1f1f75400536a27e798179afaae0977d5f2e070f51fea613d91403dd
+EBUILD countdownlatch-1.0.0-r2.ebuild 581 BLAKE2B 56634566dc51a5a38a5204f146803d1e886b9ab199c63b6767495d94e1fd977b5fb6dff590b991ef326b65715bbb78bc60284c53fc0a0af2fdb433f1b78832dd SHA512 bd025062666a129b2fc9e14c0fa6d5cbb0a8235046254c6e007531a1e4ac985ac261bc456ca6589173415af56c26d50844c099c11a7f40d53d5e48e51153b335
 MISC metadata.xml 353 BLAKE2B 9a099c6429301e215ad14e8bc0bf9976e44a4d3d1482b1948d76f7b7979e37c52666c1da8a56b1de3d77433c6ab6e60eebf89e2ab93a352caebf630913eed10c SHA512 f4d811700976ef8169412b958148447553176ef84b05a2f71d2bdd26049c2afada3f83207ef9257365d802deda87120b0e373912f0f0caa521f0429fcb531fb2
diff --git a/dev-ruby/countdownlatch/countdownlatch-1.0.0-r2.ebuild b/dev-ruby/countdownlatch/countdownlatch-1.0.0-r2.ebuild
index 3b5c7208e942..8e91f5622a34 100644
--- a/dev-ruby/countdownlatch/countdownlatch-1.0.0-r2.ebuild
+++ b/dev-ruby/countdownlatch/countdownlatch-1.0.0-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/creole/Manifest b/dev-ruby/creole/Manifest
index 9ddf1e469d7f..ef5b5dc60fb0 100644
--- a/dev-ruby/creole/Manifest
+++ b/dev-ruby/creole/Manifest
@@ -1,3 +1,3 @@
 DIST creole-0.5.0.tar.gz 10664 BLAKE2B cf284a80fc43d24dd9e232055b78b9f76e5ee7c44dc86fb3311cc191503d38cd31e6e8f7f6290c451860da3e2dc5646c5baaefa79fa5df9165d2eb867c5dc8ef SHA512 80f82018637f2c33c71cc57e65b6bf372fb508c890269c3a04cf171b549115f3cb09daf7fa29935824780b886c1077db20a6e7dd38af35d715529683d965bc07
-EBUILD creole-0.5.0-r1.ebuild 756 BLAKE2B a946dcc62122174b1c3e40c0e9024f0a8d6deb3e73c5741542c0c2d55b7d298c9ae168014f60392708e70d2557985425acce974de49b68d4d2e3d955b571f596 SHA512 fc985127ff55d94748e1de8438ad915e8c98a36944d820e04a64fa65e5db4538530d688d57a39be50e166a21bb021917591e166cd101581f8a931fadfeed88d7
+EBUILD creole-0.5.0-r1.ebuild 756 BLAKE2B 7e44a0eb2e26574c68589805fb876e29f53eaa4bd4b12310406c70602306039fe9591ae2321bdd41e775fc7c8bcd33c4b84d889389dee538ae43522f6048f3ea SHA512 fb8a21545647c6bdeb419fa8826a1c85945e7817dbf78db1f9feafd45a9c722a94e50d6e4ccc7f99fa96c188772877315ab70663de9a9b56acd43af0a0ac441e
 MISC metadata.xml 339 BLAKE2B 213172aef7c762e9e3018c7e7c53f3d4de2004045b744cd191db960942be03d592ca78663d5d85f670f3e20095db7234fc3586bb7dae8723070d2da8ee5c5051 SHA512 8ec250e92ac8729a17e8afc336668e4bff46e4edf94f466053957078095f90172fb087b5e764c128aceda6874ef3092c0c1560bc5a86584d53308ac792b1f4b7
diff --git a/dev-ruby/creole/creole-0.5.0-r1.ebuild b/dev-ruby/creole/creole-0.5.0-r1.ebuild
index 87c7dc48ceae..481e13dfef48 100644
--- a/dev-ruby/creole/creole-0.5.0-r1.ebuild
+++ b/dev-ruby/creole/creole-0.5.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rake"
 RUBY_FAKEGEM_RECIPE_DOC="none"
diff --git a/dev-ruby/curb/Manifest b/dev-ruby/curb/Manifest
index 7a419f01d1e3..b12c6bbb8581 100644
--- a/dev-ruby/curb/Manifest
+++ b/dev-ruby/curb/Manifest
@@ -1,3 +1,5 @@
 DIST curb-0.9.11.gem 88576 BLAKE2B 1656a17070151ddd1bd63c3e23885d36d8e2b133b19e00347892363a9a20c88baa10932ceb5273733b18847d8d19dc403aa4b7f36fbd80c8dde126ae46743796 SHA512 000ee2054a5866de09042dfc5894330900e401aa94a0fe8bb133fe9c661f7899992adff0585e5ed3725d3564cd9819d76653655f3539faaa61ca6acabe3a8602
+DIST curb-1.0.1.gem 90624 BLAKE2B b54404e0ea81ccb2ea03e262abce247ca4e0db1a5208cfecd57a6c0e423c36b282cdaef7db9bd3fe70d3fdb8cfa60c6085be04ff78daac71e83b63fe25bfef06 SHA512 78eeef1b3a778c64517243a25ff82889cb4703589d27f08cff6e84d39a806610a80bb749c51ddba93a82e02a18797978b55ebc4643948caa8900e76d343f4bc6
 EBUILD curb-0.9.11-r1.ebuild 1391 BLAKE2B 462de9fb6407457864bd56b2a0de59bb4723da435455b1371b2df8acd349e4a6424909897521e0a0dd7fd75520af11346bfc3193cd572247d64beca032a7ed2b SHA512 59706c93edaada27f54a15cc8ec7735b28d05a7d2736dbf0b00bf15b5502850466fb45b0278c735655493b5128e0813bc80b0cea2253541434b8611733deb222
+EBUILD curb-1.0.1.ebuild 1399 BLAKE2B aab3e44d95e6dc654a2e8b86a9f9a6ceb4321db481e742a5498f5885604143f90bc2d6d49edc0d396ec18776c8e82cd71c3f92cbe793022e32f4dff851bee4a6 SHA512 87b2e4cd6b9935a24c84e9bbe1bd4b1055609c6cb68c2d098372c5896f79828ea629ba845087516be56dd4c6606fe1bd2c9ae8102a65094329e25c80f965e9f2
 MISC metadata.xml 336 BLAKE2B fd9820c5561af2381bf081eb2f3370727020edc79f306bd94b90699e8a817d218edb11ccc60ae9aa43f1713218a91c9b53cff0a6c23fc3d189e06bc5a1265b71 SHA512 f948d0e7f36c4b9912c58d6a7bf1b2ac5934075780fc7de3d6f759276e4ee297850f725259c06245affca40745bdc2bab0ab78bbd60b308a5d11fc97edeb4ac1
diff --git a/dev-ruby/curb/curb-1.0.1.ebuild b/dev-ruby/curb/curb-1.0.1.ebuild
new file mode 100644
index 000000000000..b82ed935cd1c
--- /dev/null
+++ b/dev-ruby/curb/curb-1.0.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_RECIPE_TEST="rake"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby-language bindings for libcurl"
+HOMEPAGE="https://github.com/taf2/curb"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND+=" net-misc/curl[ssl] test? ( net-misc/curl )"
+RDEPEND+=" net-misc/curl[ssl]"
+
+all_ruby_prepare() {
+	# fix tests when localhost is also ::1
+	sed -i -e 's|localhost:|127.0.0.1:|g' tests/*.rb || die
+
+	# avoid tests making outside network connections
+	rm tests/bug_postfields_crash.rb || die
+	sed -e '/test_easy_http_verbs_must_respond_to_str/,/^  end/ s:^:#:' \
+		-i tests/tc_curl_easy.rb || die
+	sed -e '/test_connection_keepalive/aomit "network connection needed"' \
+		-i tests/tc_curl_multi.rb || die
+
+	# Fix test that expects wrong output
+	sed -i -e 's/200 OK /200 OK/' tests/tc_curl_easy.rb || die
+
+	# avoid failing tests where failure condition seems weird, no
+	# upstream travis so not clear if the test is indeed broken.
+	sed -i -e '/test_multi_easy_http/,/^  end/ s:^:#:' tests/tc_curl_multi.rb || die
+
+	# avoid test requiring ntlm support on curl which is no longer available in gentoo
+	sed -i -e '/test_username_password/aomit "ntlm support in curl needed"' -i tests/tc_curl_easy.rb || die
+}
diff --git a/dev-ruby/curses/Manifest b/dev-ruby/curses/Manifest
index 72c70a3415a7..6006fceb0726 100644
--- a/dev-ruby/curses/Manifest
+++ b/dev-ruby/curses/Manifest
@@ -3,5 +3,5 @@ DIST curses-1.4.3.gem 524288 BLAKE2B a4f0ab5d1bb2723ac406c8d61b0ef6ed1b257d4959d
 DIST curses-1.4.4.gem 524800 BLAKE2B 00749022a097a69b8a1a42b88b64a81a60cd6e6914dbc0636a1ed17db6f7b3f1f0e583b965b9b296ff27a5dc97786024f0511b2ed59e337ef29a799dda0fc577 SHA512 5e275b7bc035c9745ed19d563da97aba090f66d4831a4cf07144ff29f3b49a36bbee592e1292719d6bcfd1f6a77d2955de5d7e5ff34ce487d574482a0cee1a53
 EBUILD curses-1.4.2.ebuild 533 BLAKE2B 7dea0c7fd544995554ce01e900055d2a07a84faac372fb9532f96a6f36d3ee140e121e3adb868cbcd0c1fd02a00bd11f640a900e59a32da0bebb20dc65e0bbe3 SHA512 1e937ae22390d5252da7c47fbde733ab8198405e13d925266b33d3665c89b3f480289d935b7c8e6583831cc8da0574cd0599cf00171ac33877e29513a029e087
 EBUILD curses-1.4.3.ebuild 526 BLAKE2B 0478da45f1a95acb282760fe90fedf80f573abc68741c6fa3d444a13b558f9841c81429b974757b7e1e8a7e5f28aedace5f01ec559fe7577c31d2dbaeed4b481 SHA512 6c3b83da89f75de96cbf2fb678331554c6e4735a1646a71bedae81d1dfd251f59d22c53a07cedc21e12032c88c9e47b2993f50c7b7857423560aa36e8a893d67
-EBUILD curses-1.4.4.ebuild 526 BLAKE2B 0478da45f1a95acb282760fe90fedf80f573abc68741c6fa3d444a13b558f9841c81429b974757b7e1e8a7e5f28aedace5f01ec559fe7577c31d2dbaeed4b481 SHA512 6c3b83da89f75de96cbf2fb678331554c6e4735a1646a71bedae81d1dfd251f59d22c53a07cedc21e12032c88c9e47b2993f50c7b7857423560aa36e8a893d67
+EBUILD curses-1.4.4.ebuild 533 BLAKE2B 2e09455a9911e689ac4e175b64ccc08ad8b61d6cd1d38a1773c6e542ff2818d38708442e27558dd3edd7f109f76e558da8f4ded375162ed5a67a6958624b8ecf SHA512 55de4ad9ddd8789fcd09369e001aed95811b959c3457dce0272a0f5d69ad5540f2b6e5c598479dcc47d1102650611f15334aa1f1324f0fc4dfb665b1a2fe959e
 MISC metadata.xml 338 BLAKE2B abd01018668395bdc0e27d71ccc6341beb96b969dc215cb05760e478e46766948116542416274e0a99284458f2773dd0ab73e6041112f62181efa441d879082b SHA512 d074a3168d313769de5bcb360d0e70bafa37a5c37fd9416ea3d0b9c992648d7e5416c71256d16bdfdf83abf11b77e1fec8069fcbf56bd2c909a9ade07adb219a
diff --git a/dev-ruby/curses/curses-1.4.4.ebuild b/dev-ruby/curses/curses-1.4.4.ebuild
index 6b1ad29920c0..0c4d1ba0bfb2 100644
--- a/dev-ruby/curses/curses-1.4.4.ebuild
+++ b/dev-ruby/curses/curses-1.4.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/matrix/Manifest b/dev-ruby/matrix/Manifest
index 86808d5e1a05..a729908d7b4c 100644
--- a/dev-ruby/matrix/Manifest
+++ b/dev-ruby/matrix/Manifest
@@ -1,3 +1,3 @@
 DIST matrix-0.4.2.tar.gz 42649 BLAKE2B 03b7f3482d6d5a48c626fee824039c182a35242a2c25875e7cada4d781d1939ed780b5cbf8c45645d07c81e4f5d5c5559a1ec236a5152e095a60228e4ed3c59e SHA512 b47d1d662acdca703afd323fe9293726e051b0ef87162ff45c26c62fad2f3158f71d943f36f7c6706702885e2fdea8483b37ee45f25295225e86dec5f88590a4
-EBUILD matrix-0.4.2.ebuild 863 BLAKE2B 3781f872d5ace1f2a5b7a01e00c59fe23f910d9b497ad85fbc44ab26b33eb61c97847a09217c8ce80a28ec98fb544494bbd1330815a5df205f279f31489be534 SHA512 2c0753ac10a1ee27daae7beac40dc00375e9f6730e0befb44369515a79242a7b8023656527419a5752f8dd66bfb088c04ab902c8baa2920faa3775a7d46ddfae
+EBUILD matrix-0.4.2.ebuild 862 BLAKE2B da4b311a51b2e05cb59c3dea80cb82413f91885d4ecbbdb6b4e43d5060b074fee5643996a1373ab42e3366028656336e7bf170b76f3419dd0c3af327750d5184 SHA512 c7ce3ecfea2381c16fce4f32809b6982bd3cd7b53c03614b4ea5274ac3c0fd2bdfd5832ec55a78eddf4807d74886793221b4bbeeabb72cae6b4d9399f7c5eb6f
 MISC metadata.xml 258 BLAKE2B 3c49249352f2cb11df010da6ecd8312a27047557ca5f2686837ad66933be9ea2627c40f91daedf8dcd9099c6cdc0dc2d2ba32aaf9d888c41fb60ee098e1c0c1e SHA512 ce517e35f3c0a2a9807ee68b0a8c84ca28db8dfabb41758cac71f9da22847fe20d259295f0681e38a52a24618450a0ca097939dc1022e3987bb0088762e48326
diff --git a/dev-ruby/matrix/matrix-0.4.2.ebuild b/dev-ruby/matrix/matrix-0.4.2.ebuild
index 6bb1a3c6ee61..27da3bcb74de 100644
--- a/dev-ruby/matrix/matrix-0.4.2.ebuild
+++ b/dev-ruby/matrix/matrix-0.4.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/matrix/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 
-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"
+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"
 SLOT="$(ver_cut 1)"
 
 all_ruby_prepare() {
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 1485df21e641..de3a2853d406 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/edb-debugger/Manifest b/dev-util/edb-debugger/Manifest
index 49a83e869f78..e6ddc962de7d 100644
--- a/dev-util/edb-debugger/Manifest
+++ b/dev-util/edb-debugger/Manifest
@@ -1,4 +1,5 @@
+AUX edb-debugger-1.3.0-gcc12.patch 3374 BLAKE2B 6e75e6d940da2d54d20bfdd62dd26c7955ffcc00d00d84a1029b583b00bee69106e43a64ad5b9ab96a269b84f7a69e48c12d6acbfd0f4404b8d490660620c35f SHA512 9b0fb244ce7e80ca4810323d6198e273019b3255c40e198563da109e228f1329bf0b36560024607b6015bc1ba992e396151858cb1bed1fecc39d2dd688232e62
 DIST edb-debugger-1.3.0.tgz 618227 BLAKE2B 1650e727851b629d7778c8488a464b6439f2ac4e5a72c0738cfe1ee302538b0d97dcbf9587a1108a82f8f8f4a6bec273e31ad454063f70704ffb48ca8ba5b73f SHA512 9d813bb61cdc7b61b594e63834ffb3999d3e1bb0c7a435095efea9b3b6726369a06c553ba6633df160d9456758ff54d5eee8cfbee6a1304f3a01d09fe2c7a65d
-EBUILD edb-debugger-1.3.0.ebuild 1126 BLAKE2B c9b9391d5d06b797c3ad0e8eadab04ca983a7c344c179ded66357a99f13e26b7cb0b6fefc0d972f62b61f2599bc499243c35fd8ba77e443dd5da34d4b6cb4e95 SHA512 272eecf3dd7d6c386fbe5143a9c84baf429ae45f1c53312386567c44a4f48b472542d9f406844f015a16141066180c4c2636530b2ae8edc9b977362e52ffd0ea
+EBUILD edb-debugger-1.3.0.ebuild 1175 BLAKE2B a1cdcee8c104480f9edbef70aa619cd3a1776e5a4c161cea7b6e069294f4a96da2fd753040b1943930ee49cb3ece37e5642b7fd58f188058b009147c24ffa54a SHA512 5a4afc4dbd8a317a5a8057da9b100ed71bcf216618299a2087bf4dc43aa48ce6b5ba8ca0d7c812d068a05aca2aa127f52017be0cdf09beb1881650d86a5e7057
 EBUILD edb-debugger-9999.ebuild 932 BLAKE2B 060e1be8043c1fd6f12684b197f60cd88de8f8d35c1227246de4bba18546b23f16ddcd60cdf92a54a48cda5ab1640e9e199a1429edf52bdf935ebf18f120df19 SHA512 1c09eaaecff1866de7307512ced499f0eb10f1f3defc8663111d9cfa64f6a7ef3b846365f8e9e18e14d19fde18909e1a5bbbdc60a674f1918f0476316399d929
 MISC metadata.xml 275 BLAKE2B 382b1023fe29dd71c57d25b04115b5757d90933d0cc3eefed19ac110608bcc02c260308112523d142d342921a652eb8bb66395e10c37aeadaec13e26db64dc10 SHA512 187c55986315e59f9adfc9129c81243da596fc9827774e08c244d64301380303c682c55af8db1acc80d90f648b1b154dc5a8cbdcbba7a7475c7a90735da1ef44
diff --git a/dev-util/edb-debugger/edb-debugger-1.3.0.ebuild b/dev-util/edb-debugger/edb-debugger-1.3.0.ebuild
index 21c906d48591..e550d9ad3f47 100644
--- a/dev-util/edb-debugger/edb-debugger-1.3.0.ebuild
+++ b/dev-util/edb-debugger/edb-debugger-1.3.0.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
@@ -8,14 +8,14 @@ inherit cmake
 DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
 HOMEPAGE="https://github.com/eteran/edb-debugger"
 SRC_URI="https://github.com/eteran/edb-debugger/releases/download/${PV}/edb-debugger-${PV}.tgz"
+S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="graphviz"
 
-RDEPEND="
-	dev-libs/capstone:=
+RDEPEND="dev-libs/capstone:=
 	dev-libs/double-conversion
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
@@ -25,19 +25,17 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	dev-qt/qtxmlpatterns:5
-	graphviz? ( media-gfx/graphviz )
-"
+	graphviz? ( media-gfx/graphviz )"
+DEPEND="dev-libs/boost
+	${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-DEPEND="
-	dev-libs/boost
-	virtual/pkgconfig
-	${RDEPEND}
-"
-
-S=${WORKDIR}/${PN}
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc12.patch
+)
 
 src_prepare() {
-	#Make the desktop's entries somewhat better
+	# Make the desktop's entries somewhat better
 	sed -i -e 's/GenericName=edb debugger/GenericName=Evan\x27s Debugger/' edb.desktop || die
 	sed -i -e 's/Comment=edb debugger/Comment=edb is a cross platform x86\/x86-64 debugger/' edb.desktop || die
 
diff --git a/dev-util/edb-debugger/files/edb-debugger-1.3.0-gcc12.patch b/dev-util/edb-debugger/files/edb-debugger-1.3.0-gcc12.patch
new file mode 100644
index 000000000000..df037193310f
--- /dev/null
+++ b/dev-util/edb-debugger/files/edb-debugger-1.3.0-gcc12.patch
@@ -0,0 +1,88 @@
+https://github.com/eteran/edb-debugger/commit/da04c339559f82257ff54ea62b1d403ee98c1ba0
+https://bugs.gentoo.org/841839
+
+From da04c339559f82257ff54ea62b1d403ee98c1ba0 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sat, 2 Apr 2022 22:36:50 +0000
+Subject: [PATCH] Gcc 12 includes fix (#815)
+
+* RegisterViewModelBase.h: add <memory> for unique_ptr
+
+Without the change gcc-12 fails to build edb-debugger as:
+
+    [ 20%] Building CXX object src/CMakeFiles/edb.dir/RegisterViewModelBase.cpp.o
+    In file included from edb-debugger/src/RegisterViewModelBase.cpp:18:
+    edb-debugger/include/RegisterViewModelBase.h:162:14: error:
+      'unique_ptr' in namespace 'std' does not name a template type
+      162 |         std::unique_ptr<CategoriesHolder> rootItem;
+          |              ^~~~~~~~~~
+    edb-debugger/include/RegisterViewModelBase.h:9:1: note:
+      'std::unique_ptr' is defined in header '<memory>';
+        did you forget to '#include <memory>'?
+        8 | #include <deque>
+      +++ |+#include <memory>
+
+* State.h: add <memory> for unique_ptr
+
+Without the change gcc-12 fails to build edb-debugger as:
+
+    [ 21%] Building CXX object src/CMakeFiles/edb.dir/State.cpp.o
+    In file included from edb-debugger/src/State.cpp:19:
+    edb-debugger/include/State.h:93:14:
+      error: 'unique_ptr' in namespace 'std' does not name a template type
+       93 |         std::unique_ptr<IState> impl_;
+          |              ^~~~~~~~~~
+    edb-debugger/include/State.h:24:1:
+      note: 'std::unique_ptr' is defined in header '<memory>';
+        did you forget to '#include <memory>'?
+       23 | #include "Types.h"
+      +++ |+#include <memory>
+       24 |
+
+* IState.h: add <memory> for unique_ptr
+
+Without the change gcc-12 fails to build edb-debugger as:
+
+    [ 69%] Building CXX object plugins/DebuggerCore/CMakeFiles/DebuggerCore.dir/unix/linux/arch/x86-generic/PlatformState.cpp.o
+    In file included from edb-debugger/plugins/DebuggerCore/unix/linux/arch/x86-generic/PlatformState.h:22,
+                     from edb-debugger/plugins/DebuggerCore/unix/linux/arch/x86-generic/PlatformState.cpp:19:
+    edb-debugger/include/IState.h:33:22:
+      error: 'unique_ptr' in namespace 'std' does not name a template type
+       33 |         virtual std::unique_ptr<IState> clone() const = 0;
+          |                      ^~~~~~~~~~
+    edb-debugger/include/IState.h:23:1:
+      note: 'std::unique_ptr' is defined in header '<memory>';
+        did you forget to '#include <memory>'?
+       22 | #include "Register.h"
+      +++ |+#include <memory>
+       23 | #include "Types.h"
+--- a/include/IState.h
++++ b/include/IState.h
+@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ #ifndef ISTATE_H_20110315_
+ #define ISTATE_H_20110315_
+ 
++#include <memory>
+ #include "Register.h"
+ #include "Types.h"
+ 
+--- a/include/RegisterViewModelBase.h
++++ b/include/RegisterViewModelBase.h
+@@ -6,6 +6,7 @@
+ #include "util/Integer.h"
+ #include <QAbstractItemModel>
+ #include <deque>
++#include <memory>
+ #include <vector>
+ 
+ Q_DECLARE_METATYPE(std::vector<NumberDisplayMode>)
+--- a/include/State.h
++++ b/include/State.h
+@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ #ifndef STATE_H_20060715_
+ #define STATE_H_20060715_
+ 
++#include <memory>
+ #include "API.h"
+ #include "Types.h"
+ 
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index c61b5b6c7660..32ef415eb4a9 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -3,7 +3,7 @@ DIST meson-0.60.3.tar.gz 2001124 BLAKE2B f66fb29d309f5dea9c0b1934e8b5dfc2b33586e
 DIST meson-0.61.4.tar.gz 2014265 BLAKE2B 09e6630f8a1786143832007c929e652e743bbf11d1b55ffcf366dd127779f61e8fd4a8be5cb23fa6bc949938a3bd0222f19ad1fec883f0ca6ed8cd6d4bbd6aef SHA512 005f52c678016f3183d36b69254cceab16c682d2389ec9cae41889955a13cb643aea03f2247f3473cfeca9c4dd6c1cc8b9b8b9906dc324c08016c72380a5f195
 DIST meson-0.62.1.tar.gz 2034805 BLAKE2B 6370b6bf07e6e875f6a0cabbf6284f97c89a4653b62c4765f365fbf083e607853094aa37d5dc97042f086ca1db569b2f8dabd14b37f674615d3b9d267d3d0d0f SHA512 52d2d06c27275b824046164403908be8555faed33aef862940623cef3e4f84b4c9b8d461c291642e6ea2c0db30b2ec4a99f46bde5d54945a26c1dbeca219cc32
 EBUILD meson-0.60.3.ebuild 2678 BLAKE2B 1b602648e5c7eb7be683acf70c759499f95e3a777b42dd1e0b7d26edfa9c3b468b7b2d9a1962240f14efbb569654e1d937da3a505c8e0f68f2700c1d5ad5f2f6 SHA512 2aaf4796facbe63668cf4ae702d0a1a13cd56de0760ea803acbd48d491a2eaa76839b8a43dd1b077a9aaac8a7da416fa7de840107479b261fdaa2895a44d99c5
-EBUILD meson-0.61.4-r2.ebuild 2929 BLAKE2B 4a013004d6b64d3d67d255a743e2644192cee78409075b07539ac5d17d9d1e330b1b70c9958912737817058a5406ea1f83c19dd31d181bd60e46b2438c049c99 SHA512 2b7daa916b86e138509af788754aa4a308022ac6682e44cae21aa9b641c0e23d50190e3cc432cc447d6ef7312c916d47c2b109033e23b2ac5297485b6e1efc72
+EBUILD meson-0.61.4-r2.ebuild 2928 BLAKE2B c7e232fa4f845cbf6fa46c02b85869bcb04138d167a37633a2205aead10381e58d2d73a4b44c10d855a7be03e2c9da20ef1b140d39c6a3e2eb59f48533a721b9 SHA512 96271f7265cb24916af9ba2c8c6c97574b5a756d355bdcf426f6ec3cb7c9927554cfdd1737b3fd5ce9c1d1be0fd76efdf794162c13c284b1aef1deb826ceecc4
 EBUILD meson-0.62.1.ebuild 2851 BLAKE2B 23937951f98eef6dfd01164d8d541db5f1b9b013b504939516fc10c5cc1715ab4e35198428b35495807ad927036f081889832d7174929622a59c27b108d1f2b0 SHA512 de7815d60fd1a7b74a32e5545cde8457e1294867a0361ea27f9ea1c44f480d6333757c34ad843afa61b0d6b1985c872248f8ad6fb26501ec2b8bf9bc055358cb
 EBUILD meson-9999.ebuild 2850 BLAKE2B 5e6aac74bbae3360feed6d63570f4ff5fe9ba7381b1863fde177786911917470f9770daff1a157525c67bbfad70ca01f0a8c76ee4a40ea88d8656864779b0823 SHA512 910db880fd4f74a04caf9a5e00d4def3d642d63c3d314c31dde863f6a0aa7dda65c5e762a6494f8e1bdfd21be55e661838327bc09ba7bcde6fbce13fa657ce63
 MISC metadata.xml 424 BLAKE2B 9e8cee51a5a6699950f1f4fc203732032afa7b36229bd4117a2b2164761ba0375bbc2c6001a81b48b67171f4b9850e948f6da229cffb9649acc0f514a675c922 SHA512 266b94131a352512bfac11c3db7ff840a6d050eb71c814a5223c9d3bb6f1be30506c9188ef1725a2b435c0b44923aa3efcea5f3d041f0acce0141dfe37ba66c4
diff --git a/dev-util/meson/meson-0.61.4-r2.ebuild b/dev-util/meson/meson-0.61.4-r2.ebuild
index af5ec131844c..b0e85785a728 100644
--- a/dev-util/meson/meson-0.61.4-r2.ebuild
+++ b/dev-util/meson/meson-0.61.4-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit bash-completion-r1 distutils-r1 toolchain-funcs
diff --git a/dev-util/nemiver/Manifest b/dev-util/nemiver/Manifest
deleted file mode 100644
index 01c982a934ca..000000000000
--- a/dev-util/nemiver/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX nemiver-0.9.6-bool-build.patch 1672 BLAKE2B a92e7deb5934ced4ec2ffd6e491cce5f5aab0aa105b3220b1d67c03b6a59a1e12fd75f9c0f68ccb7df50d875cd558017e062e22c5a9d207e668aeacd98bc3b28 SHA512 28835958edbaf2fc7cd1a8eca47d118089a46a4e7a6046094092dd8c1d385db0407410b0df90057b601443c0e0b1202dc03276f4b046f565f57f7491b429f77a
-AUX nemiver-0.9.6-fix-build.patch 1123 BLAKE2B 739e42afdf466f23ec3fe3fae91f4040dae9ce6640dfe8b0ad42195785972fbd5a0d902e693246ab8cbabbece66f5e7560e5e83b214f2b4b35387cd3d5256ae7 SHA512 8a4041ea5609af8805da4fd0717cc2c3e38ef3201ca4c0ae5dc9ede193223bc47424bb0590bd90845e758f271c1001140af438b791a2b53c5ee0ec319e70ea9f
-AUX nemiver-0.9.6-gcc6-throw-in-dtors.patch 1734 BLAKE2B 4855d1d946c393815ddb5f54bd1cf74151c05c4fdf4a0a01ea50bc56109589b9fcef63a086edd4806c924ba0791ace37097cfbf1bbb6f3a6953b813c3c421052 SHA512 329c4ba78849fad8b20dba77cf66eca1994532946adb75583e19caa24da9360b50072d8ee9affac18aac65f245a96a911d783434d40ba23cee22a03dba3080cc
-DIST nemiver-0.9.6.tar.xz 1427660 BLAKE2B c7b9aeb7914498af540f664f435cb2e9c07f8b2845f8bc6f5bdc3ee2b2173346d964d44ce4a588665180670cca61581397f33bfc5ac8dd2b3501e8d951d8dec5 SHA512 6fd941975af6e9ba98d7100daf8205f8b61f75ccde4aaf30145a4e2beafe1b96b14ab70d22db7c258aabc7c1a71d4787aa121bc4e943b3fc310e00c13feb4f21
-EBUILD nemiver-0.9.6.ebuild 1407 BLAKE2B 5a61269a0909b47d02dc847afd90dde4279f93e36b101cd73885e462c02983b2135a2c976f17d3fb9453d2e2b0417d933d106f72a51a92a1a7cfc46691ecae59 SHA512 7d332099a32235f626e819ab70d81965ac202b0100e8cb7fa130d65b525257e6f28936640192e300544876482e2a1abb0ea9c44482cc6529eb85765b020ef3f8
-MISC metadata.xml 555 BLAKE2B 7f61f0e24bd962c06c09d141f90f301383aa23b14ef3fa396434c84bf6860975187ac6c230fe12bffc91eb1836fd03a9b2666099678df0387fcb22935807e21b SHA512 15d623d068504dfb7bb493c4466c7569086dfd1a6b0102fdb3f0dbf08fd1384b56cf75e2ef7a68b6b25bc5d497bb68b2ae8d756dfde8f17de61aeaa58844a996
diff --git a/dev-util/nemiver/files/nemiver-0.9.6-bool-build.patch b/dev-util/nemiver/files/nemiver-0.9.6-bool-build.patch
deleted file mode 100644
index dac65a8a4cc0..000000000000
--- a/dev-util/nemiver/files/nemiver-0.9.6-bool-build.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 262cf9657f9c2727a816972b348692adcc666008 Mon Sep 17 00:00:00 2001
-From: Marcin Kolny <marcin.kolny@gmail.com>
-Date: Fri, 1 Jul 2016 19:45:05 +0200
-Subject: Use RefPtr::bool() operator in the conditions
-
-Since bool() operator in RefPtr class is explicit,
-comparision with integer doesn't compile.
----
- src/persp/dbgperspective/nmv-dbg-perspective.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/persp/dbgperspective/nmv-dbg-perspective.cc b/src/persp/dbgperspective/nmv-dbg-perspective.cc
-index be652db..ac207e4 100644
---- a/src/persp/dbgperspective/nmv-dbg-perspective.cc
-+++ b/src/persp/dbgperspective/nmv-dbg-perspective.cc
-@@ -5672,7 +5672,7 @@ DBGPerspective::switch_to_asm (const common::DisassembleInfo &a_info,
-     a_source_editor->clear_decorations ();
- 
-     Glib::RefPtr<Gsv::Buffer> asm_buf;
--    if ((asm_buf = a_source_editor->get_assembly_source_buffer ()) == 0) {
-+    if (!(asm_buf = a_source_editor->get_assembly_source_buffer ())) {
-         SourceEditor::setup_buffer_mime_and_lang (asm_buf, "text/x-asm");
-         a_source_editor->register_assembly_source_buffer (asm_buf);
-         asm_buf = a_source_editor->get_assembly_source_buffer ();
-@@ -5720,7 +5720,7 @@ DBGPerspective::switch_to_source_code ()
- 
-     Glib::RefPtr<Gsv::Buffer> source_buf;
-     UString source_path;
--    if ((source_buf = source_editor->get_non_assembly_source_buffer ()) == 0) {
-+    if (!(source_buf = source_editor->get_non_assembly_source_buffer ())) {
-         // Woops!
-         // We don't have any source code buffer. Let's try hard to get
-         // the source code corresponding to the current frame. For that,
--- 
-cgit v0.12
-
diff --git a/dev-util/nemiver/files/nemiver-0.9.6-fix-build.patch b/dev-util/nemiver/files/nemiver-0.9.6-fix-build.patch
deleted file mode 100644
index 59a893ad003a..000000000000
--- a/dev-util/nemiver/files/nemiver-0.9.6-fix-build.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From e0e42221ceb77d88be64fac1c09792dc5c9e2f43 Mon Sep 17 00:00:00 2001
-From: Ben Iofel <iofelben@gmail.com>
-Date: Thu, 17 Mar 2016 18:28:02 -0400
-Subject: Fix compiliation warnings & errors
-
----
- src/dbgengine/nmv-dbg-common.h        | 2 +-
- src/dbgengine/nmv-i-var-list-walker.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/dbgengine/nmv-dbg-common.h b/src/dbgengine/nmv-dbg-common.h
-index ad3cc00..0edac7c 100644
---- a/src/dbgengine/nmv-dbg-common.h
-+++ b/src/dbgengine/nmv-dbg-common.h
-@@ -171,7 +171,7 @@ public:
- 
-     bool has_slot () const
-     {
--        return m_slot;
-+        return static_cast<bool> (m_slot);
-     }
- 
-     template<class T>
-diff --git a/src/dbgengine/nmv-i-var-list-walker.h b/src/dbgengine/nmv-i-var-list-walker.h
-index b719c0d..f2f3229 100644
---- a/src/dbgengine/nmv-i-var-list-walker.h
-+++ b/src/dbgengine/nmv-i-var-list-walker.h
-@@ -22,7 +22,7 @@
-  *
-  *See COPYRIGHT file copyright information.
-  */
--#ifndef __NMV_VAR_LIST_WALKER_H__
-+#ifndef __NMV_I_VAR_LIST_WALKER_H__
- #define __NMV_I_VAR_LIST_WALKER_H__
- 
- #include "nmv-i-var-walker.h"
--- 
-cgit v0.12
-
diff --git a/dev-util/nemiver/files/nemiver-0.9.6-gcc6-throw-in-dtors.patch b/dev-util/nemiver/files/nemiver-0.9.6-gcc6-throw-in-dtors.patch
deleted file mode 100644
index 91d90961cb4a..000000000000
--- a/dev-util/nemiver/files/nemiver-0.9.6-gcc6-throw-in-dtors.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Bug: https://bugs.gentoo.org/602436
-Upstream PR: https://github.com/GNOME/nemiver/pull/3
-
---- a/src/common/nmv-api-macros.h
-+++ b/src/common/nmv-api-macros.h
-@@ -52,5 +52,12 @@
- #  define NEMIVER_PURE_IFACE
- #  define NEMIVER_API
- # endif //HAS_GCC_VISIBILITY_SUPPORT
-+
-+# if __cplusplus >= 201103L
-+#  define DTOR_NOEXCEPT noexcept(false)
-+# else
-+#  define DTOR_NOEXCEPT
-+# endif //__cplusplus >= 201103L
-+
- #endif
- 
---- a/src/common/nmv-log-stream.cc
-+++ b/src/common/nmv-log-stream.cc
-@@ -393,7 +393,7 @@
-     }
- }
- 
--LogStream::~LogStream ()
-+LogStream::~LogStream () DTOR_NOEXCEPT
- {
-     LOG_D ("delete", "destructor-domain");
-     if (!m_priv) throw runtime_error ("double free in LogStrea::~LogStream");
---- a/src/common/nmv-log-stream.h
-+++ b/src/common/nmv-log-stream.h
-@@ -151,7 +151,7 @@
-                const string &a_default_domain=NMV_GENERAL_DOMAIN);
- 
-     /// \brief destructor of the log stream class
--    virtual ~LogStream ();
-+    virtual ~LogStream () DTOR_NOEXCEPT;
- 
-     /// \brief enable or disable logging for a domain
-     /// \param a_domain the domain to enable logging for
---- a/src/common/nmv-object.cc
-+++ b/src/common/nmv-object.cc
-@@ -68,7 +68,7 @@
-     return *this;
- }
- 
--Object::~Object ()
-+Object::~Object () DTOR_NOEXCEPT
- {
- }
- 
---- a/src/common/nmv-object.h
-+++ b/src/common/nmv-object.h
-@@ -54,7 +54,7 @@
- 
-     Object& operator= (Object const&);
- 
--    virtual ~Object ();
-+    virtual ~Object () DTOR_NOEXCEPT;
- 
-     void ref ();
- 
---- a/src/common/nmv-transaction.h
-+++ b/src/common/nmv-transaction.h
-@@ -116,7 +116,7 @@
-         return m_trans;
-     }
- 
--    ~TransactionAutoHelper ()
-+    ~TransactionAutoHelper () DTOR_NOEXCEPT
-     {
-         if (m_ignore) {
-             return;
diff --git a/dev-util/nemiver/metadata.xml b/dev-util/nemiver/metadata.xml
deleted file mode 100644
index 332d50cbbaba..000000000000
--- a/dev-util/nemiver/metadata.xml
+++ /dev/null
@@ -1,15 +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>
-	<longdescription>
-		Nemiver is an on going effort to write an easy to use standalone C/C++
-		debugger that integrates well in the GNOME environment.
-	</longdescription>
-	<use>
-		<flag name="memoryview">Enable the optional hexadecimal memory inspection with <pkg>app-editors/ghex</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-util/nemiver/nemiver-0.9.6.ebuild b/dev-util/nemiver/nemiver-0.9.6.ebuild
deleted file mode 100644
index b5d54807fe31..000000000000
--- a/dev-util/nemiver/nemiver-0.9.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="A gtkmm front end to the GNU Debugger (gdb)"
-HOMEPAGE="https://wiki.gnome.org/Apps/Nemiver"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug memoryview"
-
-RDEPEND="
-	>=dev-libs/glib-2.16:2[dbus]
-	>=dev-cpp/glibmm-2.30:2
-	>=dev-cpp/gtkmm-3:3.0
-	>=dev-cpp/gtksourceviewmm-3:3.0
-	>=gnome-base/gsettings-desktop-schemas-0.0.1
-	>=gnome-base/libgtop-2.19
-	x11-libs/vte:2.91
-	>=dev-db/sqlite-3:3
-	sys-devel/gdb
-	dev-libs/boost
-	memoryview? ( >=app-editors/ghex-2.90:2 )
-"
-# FIXME: dynamiclayout needs unreleased stable gdlmm:3
-# dynamiclayout? ( >=dev-cpp/gdlmm-3.0:3 )
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-util/intltool-0.40
-	dev-util/itstool
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Use RefPtr::bool() operator in the conditions, fixed in next
-	# version
-	"${FILESDIR}/${P}-bool-build.patch"
-
-	# Fix compiliation warnings & errors, fixed in next version
-	"${FILESDIR}/${P}-fix-build.patch"
-
-	# Fix building with GCC-6 and CXXFLAGS="-Werror=terminate"
-	"${FILESDIR}/${P}-gcc6-throw-in-dtors.patch"
-)
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-dynamiclayout \
-		--disable-static \
-		--disable-symsvis \
-		--enable-gsettings \
-		$(use_enable debug) \
-		$(use_enable memoryview)
-}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index a2d943a42976..9c958a92844c 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/repo/Manifest b/dev-vcs/repo/Manifest
index 5dab27a906b1..1b8136d9e767 100644
--- a/dev-vcs/repo/Manifest
+++ b/dev-vcs/repo/Manifest
@@ -5,5 +5,5 @@ DIST repo-511a0e54f5801a3f36c00fac478a596d83867d10-bash-completion.sh.base64 428
 DIST repo-v2.17-bash-completion.sh.base64 5736 BLAKE2B 59c357d76feb176b7c64791ffb838ab522179c7e05d1a1cca6e121c9c908cdbccc49f177951986470806302b881b39ab44710b66b0a6a8c9643d4a647841eddf SHA512 9bc4f57d58222297f53e6dcbed1b895e8d0a90558be58a423243c886cb5cfad11c32e7c599b2e237e3f53b2857f8441ddb476484189135b71f52ca7250dfaf62
 EBUILD repo-2.15.ebuild 1253 BLAKE2B f9a3b7eb2a335376a68519eb2d7cad7ea7765c28132b23b31ba6fde4c2a1cf81304f2d1d84d4293346f8a99e9c02934824d9db40d62f57ca4537ebfeb9a21bd4 SHA512 7706d0558c7c5d2c5975dbde52cce0710deea1b3204ff499e83f20e49bf66275481f122f7a76919abd58b23a7d565a0be89b0cedc72cd60e8301207e2063e3e2
 EBUILD repo-2.17.ebuild 1218 BLAKE2B f4876b7f1d9f953615bf4305cbfc3d98ec84976d0a694bd0f74a39995f48d42d7477d161c336301b8590f0480caa844433172228aebf38b0e0a32aff260fb997 SHA512 0b35bdcb0769f19e3abadd778e6f50de3ee59b6ebc1f6d9b4491cf025f469d3fcfc1f1ff25958905225b46ba0dd20ba83b996d42a3c0196803cc01e94c274290
-EBUILD repo-2.21.ebuild 964 BLAKE2B 4fb9d6382d8240d54102907a0abf7eb7c806700e3a78cfdccdcf4740efc710820b2141f2001b4aca025be72840d8e06e6d37dc0f77d7fd99620f4032f6a0ba0d SHA512 3c6d3c5939be9be51429d4451dac183de902d1bd00967bde131d985cfdd91989d7b3077ca69e1564b6d30061111c400993f1c8044a5565710a94c331d8517e00
+EBUILD repo-2.21.ebuild 962 BLAKE2B bed6a27f36946fe9ab258c8dea9e0b095b2dba4f75296a9ffac77c42261051cca6a6b854be9c65280e16402450c4b5a2db6d54312c25c2396b0cb8b70e9ef52b SHA512 091e3e777a6a66136395b536ff14ca3facb2d1b15517a1069b84672c6d4d5313d5613b4ec78df26769b5995fd834cc955414643850d21648ac26a9e87100d551
 MISC metadata.xml 248 BLAKE2B 2545c58c45b8fd57a236bab059e0bd3da47a3e0d3881d141a9b2dc2e275a2d8f0663d83366b45103b48fd257d62a4a2314a8dd6b79113f8b86c91a90524918c5 SHA512 1397e06cb2ad5941988872f37df6f54100aaa06bfc7ef30ba394f95191ddaa1e9f2180d8eb856eb10f9646d9cbc4a6f020805470633c492519e66e3de788439a
diff --git a/dev-vcs/repo/repo-2.21.ebuild b/dev-vcs/repo/repo-2.21.ebuild
index 9490022de874..4e1cb742476e 100644
--- a/dev-vcs/repo/repo-2.21.ebuild
+++ b/dev-vcs/repo/repo-2.21.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
 
 # NB: The ${PV} tracks the *repo launcher version*, not the last signed release
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/GerritCodeReview/git-repo/archive/refs/tags/v${PV}.t
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-vcs/stgit/Manifest b/dev-vcs/stgit/Manifest
index 7f78584fc957..ff44828c3884 100644
--- a/dev-vcs/stgit/Manifest
+++ b/dev-vcs/stgit/Manifest
@@ -1,5 +1,3 @@
-DIST stgit-1.4.tar.gz 390734 BLAKE2B a2c8b6848cacd743022318ebf9a0512c6bd02a2b8c864db2270e5075c82dfd9e6037a3a79978b2061487bf040864077b0f7836c66986d82ff3eb902331589d87 SHA512 5251dc26a7c64dcc83021399f95ea911d6b65cfb2ee5c016c886447740ed48b66d3f0bd92a45b4aed40ae2e77dfe6ba62336dbba6773a1879ab749c95bb99b4b
 DIST stgit-1.5.tar.gz 398562 BLAKE2B 922e014dcd0976a6b9ac884faa5ac6d8cb0e9efe6c56201c85675afb041e0190d07fb3cbcd366664b736d428d93188fc92c19db9a8d1fdc322054e1480b5b8f8 SHA512 6f018754f43c3ba48ce381b59f0e4033c295f0bd0acee4d07c1457f2c004caee9d8e9f6b2af1ee0d46941777639c7f5a49caa4c0dd01a72c3f3a43a34bf9b2bf
-EBUILD stgit-1.4.ebuild 1813 BLAKE2B 1505ba0218afe136851c24864fac25f85495b0a8bc2bf6e0dcec665f53e50def7a1e24ebe054e0d0b1da909ce18b0b164231e59766b2db74e062d8853ff2bc17 SHA512 cd838bcab5e06caaf2aa08fd03dbab09af2c26cb74f1aee9ecaee3de28daaa8213788da8b0f1431ef4d497075292e7b91cff3c716081867287f422656faaf645
-EBUILD stgit-1.5.ebuild 1813 BLAKE2B adf3573a5971cfe922b8fef124eb6fd7266f17b18259dfa5086318e9d6f2502fd20fd03635b7f7efcd6ce01bbe11cc78d936b24d1b3d1c37536c86b97353f20f SHA512 01497bf1fcdd45c0e844aa78fbe1f9ba2b4e19aab7c8cac5b4b539f47bd6bc514f41698a11f116542196757cf9c8555659749b640246e2d23aba55862a330584
+EBUILD stgit-1.5.ebuild 1815 BLAKE2B 85437e704d4c1f75d8e46c0765c130e336b36b559c0c36199ff2602e163739c2841a61c958a0b292e3b7afc912d785ee246f53dafddb27c73e0f953b51b71896 SHA512 96873e57149a7bb5e3520dfe7d934b5e43ed7ef58b950fbad73e93395fddcdfe98732a09822ec7f163c3f5a93cfdab6e9f5a490e5dccb35f31e2c9b180f97b49
 MISC metadata.xml 347 BLAKE2B 152f011c7facd06cc1c654f388b4a44bbd8486549c07f1329d228e252a411bfb565e4f5b9e37bf9eefc23fda47a774c347d2e82070ac21c0880806bca99a6685 SHA512 04b087c0e6c6ae99128dab9c29e49d55e1cbcac3890f6324d3ea66b14530e92ca9ed32e9a6dfa23f06e23f8b79b3e57ceff2c9cc2995af4e01c91914d50361d0
diff --git a/dev-vcs/stgit/stgit-1.4.ebuild b/dev-vcs/stgit/stgit-1.4.ebuild
deleted file mode 100644
index 27a2b51f5133..000000000000
--- a/dev-vcs/stgit/stgit-1.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=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Manage a stack of patches using GIT as a backend"
-HOMEPAGE="https://stacked-git.github.io"
-UPSTREAM_VER=
-[[ -n ${UPSTREAM_VER} ]] && \
-	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-
-SRC_URI="https://github.com/ctmarinas/stgit/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${UPSTREAM_PATCHSET_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND=">=dev-vcs/git-1.6.3.3"
-
-# NOTE: It seems to be quite important which asciidoc version to use.
-# So keep an eye on it for the future.
-DEPEND="${RDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-		dev-lang/perl
-	)"
-
-pkg_setup() {
-	if ! use doc; then
-		echo
-		ewarn "Manpages will not be built and installed."
-		ewarn "Enable the 'doc' useflag, if you want them."
-		echo
-	fi
-}
-
-python_prepare_all() {
-	# Upstream's patchset
-	[[ -n ${UPSTREAM_VER} ]] && \
-		eapply "${WORKDIR}"/patches-upstream
-
-	# this will be a noop, as we are working with a tarball,
-	# but throws git errors --> just get rid of it
-	echo "version=\"${PV}\"" > "${S}"/stgit/builtin_version.py
-
-	distutils-r1_python_prepare_all
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	# bug 526468
-	if use doc; then
-		emake htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \
-			mandir="${EPREFIX}/usr/share/man/" \
-			doc
-	fi
-}
-
-src_install() {
-	if use doc; then
-		emake DESTDIR="${D}" \
-			htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \
-			mandir="${EPREFIX}/usr/share/man/" \
-			install-doc install-html
-	fi
-
-	distutils-r1_src_install
-
-	newbashcomp completion/stgit.bash 'stg'
-}
diff --git a/dev-vcs/stgit/stgit-1.5.ebuild b/dev-vcs/stgit/stgit-1.5.ebuild
index f9e8edc7ca9c..ee720e163bc4 100644
--- a/dev-vcs/stgit/stgit-1.5.ebuild
+++ b/dev-vcs/stgit/stgit-1.5.ebuild
@@ -13,7 +13,7 @@ UPSTREAM_VER=
 [[ -n ${UPSTREAM_VER} ]] && \
 	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
 
-SRC_URI="https://github.com/ctmarinas/stgit/archive/v${PV}.tar.gz -> ${P}.tar.gz
+SRC_URI="https://github.com/stacked-git/stgit/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	${UPSTREAM_PATCHSET_URI}"
 
 LICENSE="GPL-2"
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 41e696732acd..93c7de61a48d 100644
Binary files a/games-misc/Manifest.gz and b/games-misc/Manifest.gz differ
diff --git a/games-misc/fortune-mod/Manifest b/games-misc/fortune-mod/Manifest
index cc120d76c736..1317319d908e 100644
--- a/games-misc/fortune-mod/Manifest
+++ b/games-misc/fortune-mod/Manifest
@@ -8,7 +8,7 @@ DIST fortune-mod-3.14.0.tar.xz 1428984 BLAKE2B 9b7df93cd7ced677a391ed30a84503cbd
 DIST fortune-mod-3.6.1.tar.xz 1419132 BLAKE2B 0ff684ee8aaf5eaabd75f187a3bff533ab4ee6e66c47c57fc700d2671006c8dff42f732fde78b40516f8ee907a52fc1965fb0ff257b12563d645f97c5ebc0031 SHA512 3f35bf35d62c46dfeaca450a127a7444bb870f6345c92afe626f81548ac375d21306c00a56d31982b8e25129acd6f829402d5afaec676e1200ad5bf586f7a8f1
 EBUILD fortune-mod-1.99.1-r3.ebuild 1647 BLAKE2B 47842da549c84f1b5231b10875fa64fd1334b276e8840cf6823cfdc9b0d5f27f488f61da8d38d885036c457be43b91ee5d7976978afeafb7cda40323e8b6ec41 SHA512 34d5ae85bdf682b945184531d20da7b10526a74c38c12f856afc161c9d3fc1677fc3ce91b06e6bb93b7916520abb98406c21aac7ec5f4a64a530ac91398dc955
 EBUILD fortune-mod-3.10.0.ebuild 1026 BLAKE2B a13b18432e2098f7e88413ca5ca57ee8d72ee2e28cca576edf98e413b2c15c5314e5febe5fe96fcf2611628af1e1a2a149db336581dc2d1eae3eeec3994abddf SHA512 a1ad35f0a72f3671032773c45de0a56a4e92facd36e67df1c67e42ef24cce60142dc1796e0f5d75d0a37c737036ba9f095f27a550084d00ee2f437ac8c5cf116
-EBUILD fortune-mod-3.12.0.ebuild 1035 BLAKE2B 415455ab7dae534fcc92b51409d652491f9541e60d9b4a7cf6f5cf50e93bd2177e3d03019af36ceb0f3998ed32fde3b91714eef3b7e402c09725983fd8190017 SHA512 e2516382120eb8a179df89d17d0cce3d990821bbda2b6cfc4e37c119faaca2bbf6519cd93c627ce12f944b2c31a214a09602ea8f0388bd9c1c526748edae213f
+EBUILD fortune-mod-3.12.0.ebuild 1034 BLAKE2B d88c039bb1357906893dc989fc6c36579e540eb91ec4c53c53edf5bb408ead722c178e8bf9b39a45c2f92defe585672a363c386bc5d5f476aeb62e5d4c252a91 SHA512 cf20c11d1822df4acd81345f2c518f4ba6cd769752181c06ccbeeeeb6f3657abeeadacb51fd2a975d2623550c02a2b89229274cd170234aa2d0b70edaeba47f7
 EBUILD fortune-mod-3.14.0.ebuild 1313 BLAKE2B 34d317ca3890e96b7ae3bb95fc14634d5657b66d0b8539c42f71a727b341b0a01aec53d969af342d46ab96d56925425ad1eb9959ec38f7247a1be5f8353ec7ad SHA512 aaae9a3f3067ba072aa516c1b156ae08ea9ba0efbffd0eeb516d7ffbf6c34a5787055e2b1d3579cbb50e75d87e60d9535537ae9c8f4a26176b953f570ebd319e
 EBUILD fortune-mod-3.6.1-r1.ebuild 998 BLAKE2B dc9625552ed2492fdd3f9c7cb07bf79c87d1795cd5c530745055ecf76633d41ade32adf47830dcfb2178759a49891c72f2c5f9765ebb98474a20dcd4c7be8c3f SHA512 f542bdac95508c993d9008075ae86409289455896f843ebb3e2e2a820258c3940cfb9540f4b3426d4f7fad98d7691a93756fbfe895f26215f73ca748d1cd920a
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-misc/fortune-mod/fortune-mod-3.12.0.ebuild b/games-misc/fortune-mod/fortune-mod-3.12.0.ebuild
index 237c144c69e0..203ee916b253 100644
--- a/games-misc/fortune-mod/fortune-mod-3.12.0.ebuild
+++ b/games-misc/fortune-mod/fortune-mod-3.12.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shlomif/fortune-mod/releases/download/${P}/${P}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc64 ~riscv ~sparc x86"
 IUSE="offensive"
 
 DEPEND="app-text/recode:=
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 23cadfcaa0d6..793269d833e2 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 96be117d5658..e49f32e6afa3 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -8,7 +8,9 @@ AUX 42.0-optional-bluetooth.patch 2032 BLAKE2B 635ba18f5bb5ca0c9f44fe11c2b526523
 DIST gnome-shell-41.4.tar.xz 1899464 BLAKE2B 202408be8886bb5eb5615328a774993bea8dfe2fb78d304fde2806096ca68eff3fae7d5bdb4972b627cf10192ff76e3d457dc37eaa806cd4ed57d1558c235a48 SHA512 6ed5f215fcf9a1cf450b406620568aeceb3d255e0bb979151ccd2260565748e69825d7f5f7fb0c6768ed584a530599a8dcbc713c1ec12617551ae9df782c5ad7
 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
 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.ebuild 7356 BLAKE2B 11be2d6171e95520dfebadefa926ef69f9c7a0d450fc4402a6c1e8dde93e08d1d7735d1c51c9387091ff84dabd692b7849a87daa3fa917fef65babf35448d208 SHA512 1820a7d815f860eb085cce14f312246b18548e0be767dbdf2d612f86e0a41a40a9a30f77e519f6cb039d06e12812df8ec22a3f735d5bce4eefb61a89e8f47de3
 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
new file mode 100644
index 000000000000..00a7785b1bb4
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-42.1.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..10} )
+
+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.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_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-gtk
+"
+# 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/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index 47c32e934cc4..cf90d2436096 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -1,6 +1,6 @@
 AUX 3.32.0-default-fonts.patch 1386 BLAKE2B 7d1c4a8279b9b8ca752804ea45efed9b61ec9844843793dc568e3012d3cd80c7a5f7a921e8dcc42406c6e15010fa472edf9cb10b7c86d1f8f69da2f6a3a034b7 SHA512 190129064554a36b56ba308f8dd75a9b8ee5ccfadffc0b5d528b5ba70324bcb3436acab116ad7768f59d316c3c2bd85dad9e8147050cb475b21fce439cb92705
 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 1124 BLAKE2B 3aba04271de57a81acb84c9acd623692b31debdbcec74680fc067458139e70301d1a53558122740cfa7ca417cd29cad10ebfa6c4c43986dfd33a40d1cb96a038 SHA512 ad6e8e6b60ed13b2cac922007566481377883537d344eef8a759b972378381851cc051eaa6b41a14ca0f4449f62d9625d0c52f372e2474030c3e5098027635b8
+EBUILD gsettings-desktop-schemas-41.0.ebuild 1123 BLAKE2B e84b22f96f0e9f4c2ad9a89e0fc1a6e6c6d8801e599938740e4a72a892f2acd288ee5904f95627a53b1017a0f079a306bef079aee9da9690fbc1c986196c39bf SHA512 89715cbac35329caeee9486cacfbe3481e1cd0cc104bd6cc530a87d66f80c18a8c76ff005c07fd99ab9cbe71ea9d3cfebd7a752459665b3f8390bc692a67dfb6
 EBUILD gsettings-desktop-schemas-42.0.ebuild 1131 BLAKE2B 06bda37dd9ef06b89fbfe3d8b795c638be5cf9ac066c995489875f4e04d02ecb9c12f3ee6ce15b42b995c7ad7c68accf3983079dac16b1d4605a4baa20d0bccf SHA512 48349d9f5b74a149d6993dd49b8949317e564b946d03a6c6e48badc8be51d4fcbdaec72dc0521682bdec7b7d67a3fbab85d0ae138d5d7c726abf4b3422a7be9d
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-41.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-41.0.ebuild
index 134b3e3fb7c1..9e31a5c70b79 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-41.0.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-41.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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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-extra/Manifest.gz b/gnome-extra/Manifest.gz
index f125a6e1d06b..63d91e34bb93 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index cdccb57a476b..ff500cbc67a6 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -3,5 +3,5 @@ DIST evolution-ews-3.44.0.tar.xz 688444 BLAKE2B d563137c481dc51f9934fe44a3c563e7
 DIST evolution-ews-3.44.1.tar.xz 688764 BLAKE2B bf3b5785a533721b6100479a6cd409a49d3aa37055d6a24a5b6d8ca1338f051ab4cb9801f24ab624d4c24dcb3c3cba7639001269514206749ef305ce0723063c SHA512 69d60ebd6e65fae505515b5ade626c867d9272e80f906f55933617c58148441da49f3d36a36205cacdb7f4997da4b90a77f3b9011775f20ac627728a41b210b0
 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 1415 BLAKE2B 2be35cc918abc4b827f17fbb62748da42eebcb323cac56c227f647368617704238dcb9d9b33536add9cdc4be01898b8734e4969f67aded88c49d2f829324e4e1 SHA512 75e7e713ca8d846d168cc27713c7c1e4d78e16d5fdb192872e9269d4263298a7f60ddb29b49a550f13da018af5f34fa4ba82312ee5111b1a2b171df91dde48ef
+EBUILD evolution-ews-3.44.1.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 4f5c552f73d3..478c6401b9f3 100644
--- a/gnome-extra/evolution-ews/evolution-ews-3.44.1.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.44.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake gnome2
+inherit cmake gnome2 optfeature
 
 DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
 HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
@@ -66,3 +66,7 @@ src_test() {
 src_install() {
 	cmake_src_install
 }
+
+pkg_postinst() {
+	optfeature "oauth support" gnome-extra/evolution-data-server[oauth]
+}
diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index 4724427ca07a..110b7a40b03f 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -1,6 +1,8 @@
 AUX gnome-shell-extensions-41.1-meson-0.61.patch 383 BLAKE2B f40a994294b3a6fe1aafa92d87774aabe5e1ec75913f1902c746227198db4baf928c2f96c63eda8531668dd998eee0484ab6a506785491bad1bfe5a3721b3547 SHA512 beed6cece8b0bce2e8fe5f210b7ebb36f75192ef91e7cd407ae83216516f6bacbcbb76c2591b601cf7fe1866ac30c220026b349066aa95f06bbbf2393cf32b65
 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
 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
 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
new file mode 100644
index 000000000000..763ce0e49faf
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.1.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/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 463c42994c15..16cecb9f9099 100644
Binary files a/kde-frameworks/Manifest.gz and b/kde-frameworks/Manifest.gz differ
diff --git a/kde-frameworks/kholidays/Manifest b/kde-frameworks/kholidays/Manifest
index b5b9d4b6f9bb..3519b78aad33 100644
--- a/kde-frameworks/kholidays/Manifest
+++ b/kde-frameworks/kholidays/Manifest
@@ -1,4 +1,3 @@
-AUX kholidays-5.90.0-UK-2022-spring-bank-holiday.patch 4481 BLAKE2B d7f7e5f129e2e0c3fc0c13817f7fb5b1af757170654016c34607c584fb68bffee2f898235648d91c0b47fbd3798af0165a362db1a959169544e0b223170a751a SHA512 38869eef2cf8fdd615200e8129099923125ef07c56615316f67a4b8fc683f1ce9719d22d1860c5e61f67e0064f131c15e3d56b7513a3a6c1c8932c730f67a351
 DIST kholidays-5.92.0.tar.xz 235388 BLAKE2B 3ce0840c458522a8d4d407d620ef7f69fea8f0da5f42d33ec896147e436355aeeabc028b823a2e23a339ac31eeece61e381ca8eaa59e9fff5fb2801344766ff3 SHA512 1ec4c5bc513685e7f8834621ce464a003876b4c26ee4ff84db5f13e1cb253fb7e1c04fc7ed1b9ad92dc7990498e8d5d10fe4b3799f33762eabe155296093a3f7
 DIST kholidays-5.93.0.tar.xz 235784 BLAKE2B ea45740a503ae7c00e234ed8838ace29b70e5518c7063ec89e1556abbeb795c29e382ed59d611d3d3f87498850a94d8ae71b3c1a173fb0f14fa261b4239a9eca SHA512 b2921ae46d8d94d018d5b6678e9565de0c2e9ee1062da3ae875c1097fd63271b8b4ae1eaefd652da069080fc0b5b98dbf339b72277a4a2cc2d6ff39592995aaf
 EBUILD kholidays-5.92.0.ebuild 656 BLAKE2B 4f29338c5b9ab7d8df9078dd52d997c01f99286a7615f97b63ba8ec312fbad406245db32d8f0f65b87b787cfbacb83dc374fabf31331b06c50a81f71565c57a1 SHA512 a1a8778a75050d53c6ed2476771c4c2504c81b8efc9c9e0359d6d8799b802ad41fa5845ee1ff2179cc7a8819d04a02e8f94e06e2c1bb66fe0c5a5172f47c92fd
diff --git a/kde-frameworks/kholidays/files/kholidays-5.90.0-UK-2022-spring-bank-holiday.patch b/kde-frameworks/kholidays/files/kholidays-5.90.0-UK-2022-spring-bank-holiday.patch
deleted file mode 100644
index 15d630269b40..000000000000
--- a/kde-frameworks/kholidays/files/kholidays-5.90.0-UK-2022-spring-bank-holiday.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From f46efdf93ebf02b5e7ac0ac0b11aefbd42ec71b2 Mon Sep 17 00:00:00 2001
-From: Allen Winter <winter@kde.org>
-Date: Sat, 15 Jan 2022 09:54:39 -0500
-Subject: [PATCH] UK holiday change 2022 (Spring bank holiday)
-
-applied to all 3 legal regions
-
-BUG: 448305
-FIXED-IN: 5.91
----
- holidays/plan2/holiday_gb-eaw_en-gb | 5 ++++-
- holidays/plan2/holiday_gb-nir_en-gb | 5 ++++-
- holidays/plan2/holiday_gb-sct_en-gb | 5 ++++-
- 3 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/holidays/plan2/holiday_gb-eaw_en-gb b/holidays/plan2/holiday_gb-eaw_en-gb
-index 64bdee7..4235247 100644
---- a/holidays/plan2/holiday_gb-eaw_en-gb
-+++ b/holidays/plan2/holiday_gb-eaw_en-gb
-@@ -27,8 +27,11 @@ description "National holiday file for England and Wales"
- "Easter Monday"                 public on easter plus 1
- "Royal Wedding"                 public on 29.4.2011
- "Early May Bank Holiday"        public on ((year == 2020) ? [may 8] : [first monday in may])
--"Spring Bank Holiday"           public on ((year == 2012) ? [june 4] : [last monday in may])
-+"Spring Bank Holiday"           public on ((year == 2012) ? [june 4] :
-+                                           ((year == 2022) ? [june 2] :
-+                                            [last monday in may]))
- "Diamond Jubilee Holiday"       public on 5.6.2012
-+"Platinum Jubilee Holiday"      public on 3.6.2022
- "Summer Bank Holiday"           public on last monday in august
- "Christmas Day"                 public religious on december 25
- "Christmas Day Bank Holiday"    public on ( (([december 25] == [saturday after ([december 25])]) || ([december 25] == [sunday after ([december 25])])) ?
-diff --git a/holidays/plan2/holiday_gb-nir_en-gb b/holidays/plan2/holiday_gb-nir_en-gb
-index 677f290..85c2de6 100644
---- a/holidays/plan2/holiday_gb-nir_en-gb
-+++ b/holidays/plan2/holiday_gb-nir_en-gb
-@@ -33,8 +33,11 @@ description "National holiday file for Northern Ireland"
- "Easter Monday"                             public on easter plus 1
- "Royal Wedding"                             public on 29.4.2011
- "Early May Bank Holiday"                    public on ((year == 2020) ? [may 8] : [first monday in may])
--"Spring Bank Holiday"                       public on ((year == 2012) ? [june 4] : [last monday in may])
-+"Spring Bank Holiday"                       public on ((year == 2012) ? [june 4] :
-+                                                       ((year == 2022) ? [june 2] :
-+                                                         [last monday in may]))
- "Diamond Jubilee Holiday"                   public on 5.6.2012
-+"Platinum Jubilee Holiday"                  public on 3.6.2022
- "Battle of the Boyne (Orangemen's Day)"     public on july 12
- "Battle of the Boyne Bank Holiday"          public on ( (([july 12] == [saturday after ([july 12])]) ||
-                                                           ([july 12] == [sunday after ([july 12])])) ?
-diff --git a/holidays/plan2/holiday_gb-sct_en-gb b/holidays/plan2/holiday_gb-sct_en-gb
-index 57d90d6..938d639 100644
---- a/holidays/plan2/holiday_gb-sct_en-gb
-+++ b/holidays/plan2/holiday_gb-sct_en-gb
-@@ -43,6 +43,7 @@ description "National holiday file for Scotland"
- "Royal Wedding"                     public on 29.4.2011
- "Early May Bank Holiday"            public on ((year == 2020) ? [may 8] : [first monday in may])
- "Diamond Jubilee Holiday"           public on 5.6.2012
-+"Platinum Jubilee Holiday"          public on 3.6.2022
- "Christmas Day"                     public religious on december 25
- "Christmas Day Substitute Holiday"  public on ( (([december 25] == [saturday after ([december 25])]) ||
-                                                   ([december 25] == [sunday after ([december 25])])) ?
-@@ -60,7 +61,9 @@ description "National holiday file for Scotland"
- 
- :: Financial
- "Good Friday Bank Holiday"          religious on easter minus 2
--"Spring Bank Holiday"               civil on ((year == 2012) ? [june 4] : [last monday in may])
-+"Spring Bank Holiday"               civil on ((year == 2012) ? [june 4] :
-+                                              ((year == 2022) ? [june 2] :
-+                                               [last monday in may]))
- "Summer Bank Holiday"               civil on first monday in august
- "St Andrew's Day Bank Holiday"      civil on ( (([november 30] == [saturday after ([november 30])]) ||
-                                                 ([november 30] == [sunday after ([november 30])])) ?
--- 
-GitLab
-
diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index a00ee90a28b2..58548bf58f22 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1,4 +1,3 @@
-AUX kwindowsystem-5.90.0-avoid-XKeycodeToKeysym.patch 1918 BLAKE2B 2407fc4cd4ebf3f3979be4dcc2f9d9859c7dedfd03d797e150d42989d2ce1008294d1a29ee0edbf1455863f4e75663c1622a066898dc06967b883a00d361840e SHA512 633719c5f28cc515fa5623f57813b2f3e88cf933343b68b2a13e32a5910af6fb1a7b023c95e5b98f994f08e7e9b778d2a6728b4f8b31559fb021dd3b303bb9ce
 DIST kwindowsystem-5.92.0.tar.xz 182136 BLAKE2B 0324dfbf0480bf91ab10cd35adf4b38a85decd463a7e14f94ef9b50ec34344c0119599c45c3148613caae22e5be6af6bf4d5cecf8d2674fad25a4d573d6c0146 SHA512 022f0a26ddd19b10d1f3365218030e148123ade4324c60f028a01f8ae96426a53de09d2eb60aa46534447da9125ef01b856d4efcd45d56ee5bb26ce784e927e7
 DIST kwindowsystem-5.93.0.tar.xz 182128 BLAKE2B 4a35d35a2b046e437ef9463de0ffb1f7d77fcafcf28605d23e5944024de2623994335c524d56df3cf74c562ff4dc614e2071a9bb665e269483d797cac4b1c5fc SHA512 10a31b5d51e747320233530694a327389875939fe3b88302243f3069ba446419c6d4cd4a30c1bf49d5cc0d50f032ff2a18230fa4cd5cb73eb2179d44bfc864d3
 EBUILD kwindowsystem-5.92.0.ebuild 856 BLAKE2B 838e64f173bf54dd7df36a8fbae3b5769c54cb2e770696d5bdb0b18f08982b4445809698f37af39a8b06e564c068d34143fafc836613bf6a0bf906b26e59db66 SHA512 f99396c7c297b43044ba5b9278bd3eac72260597420e29b85b07f7052129dc8a1947e8b2badb4d1e6b22571b28b4d291b899245d63ff75b96d8f093ab18102e9
diff --git a/kde-frameworks/kwindowsystem/files/kwindowsystem-5.90.0-avoid-XKeycodeToKeysym.patch b/kde-frameworks/kwindowsystem/files/kwindowsystem-5.90.0-avoid-XKeycodeToKeysym.patch
deleted file mode 100644
index a9f47883e6e8..000000000000
--- a/kde-frameworks/kwindowsystem/files/kwindowsystem-5.90.0-avoid-XKeycodeToKeysym.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 6e3d645d444073097e93520f047bb2321673119a Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Sun, 2 Jan 2022 23:52:07 +0100
-Subject: [PATCH] Avoid XKeycodeToKeysym in KKeyServer::initializeMods
-
-Xlib functions which work with keyboard mappings have a (Display) internal
-cache, which needs to be refreshed on mapping changes by calling
-X(kb)RefreshKeyboardMapping on change notify events.
-
-After Qt switched to XCB, that is no longer happening, and it's also not
-possible to get to the XEvent needed for triggering the refresh. Switch
-over to using the XCB equivalent and just load the symbols on every invocation.
-
-BUG: 426684
----
- src/platforms/xcb/kkeyserver.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/platforms/xcb/kkeyserver.cpp b/src/platforms/xcb/kkeyserver.cpp
-index 306c63b..bc43dbd 100644
---- a/src/platforms/xcb/kkeyserver.cpp
-+++ b/src/platforms/xcb/kkeyserver.cpp
-@@ -496,6 +496,7 @@ bool initializeMods()
-     }
- 
-     checkDisplay();
-+    xcb_key_symbols_t *symbols = xcb_key_symbols_alloc(QX11Info::connection());
-     XModifierKeymap *xmk = XGetModifierMapping(QX11Info::display());
- 
-     int min_keycode;
-@@ -515,7 +516,7 @@ bool initializeMods()
-         // found fixes the problem.
-         for (int j = 0; j < xmk->max_keypermod; ++j) {
-             for (int k = 0; k < keysyms_per_keycode; ++k) {
--                keySymX = XKeycodeToKeysym(QX11Info::display(), xmk->modifiermap[xmk->max_keypermod * i + j], k);
-+                keySymX = xcb_key_symbols_get_keysym(symbols, xmk->modifiermap[xmk->max_keypermod * i + j], k);
- 
-                 switch (keySymX) {
-                 case XK_Alt_L:
-@@ -628,6 +629,7 @@ bool initializeMods()
-     g_rgX11ModInfo[2].modX = g_alt_mask;
-     g_rgX11ModInfo[3].modX = g_meta_mask;
- 
-+    xcb_key_symbols_free(symbols);
-     XFreeModifiermap(xmk);
-     g_bInitializedMods = true;
- 
--- 
-GitLab
-
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index dd68fa2b4728..10390e747e6a 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/pyzor/Manifest b/mail-filter/pyzor/Manifest
index 3dce394454df..1a54e28a890b 100644
--- a/mail-filter/pyzor/Manifest
+++ b/mail-filter/pyzor/Manifest
@@ -1,3 +1,5 @@
 DIST pyzor-1.0.0_p20200523.tar.gz 138077 BLAKE2B 13ad30f06ce32a24a42dd5aaa21ad2a6700df1bac3dc54a86532748688b094ee0f56a8e28e34336298388c6e0b95868e95d040866c9afa561d867069496608fe SHA512 afe3b14794aea68b1a7d72840257976c7c9f755a6f6dcaaf6ebacab465c176fe2aa84f3fe176006cdbe26ef0b07ed949f75f6ef729f65c604fadf6ce8472da8f
+DIST pyzor-1.0.0_p20211223.tar.gz 138500 BLAKE2B 242a7b2df3451f659d820771454e685868792bd2275b6d69d4c4adfd6044c781abe2d72fe1500a6074851faf8e88e95d6578c546d4d95fda03e11609d1a0b436 SHA512 218bea40515a21b1e08b2bad5b7ba339ba84fff2da425dc58df72a967730ebe10e319944e1604ff56bb37f6a8ae7bc0cd974b54b18a4878ba103131b8ea47b67
 EBUILD pyzor-1.0.0_p20200523.ebuild 1565 BLAKE2B 09a2f7abd6979ffede603c0e20f3a6656481fba2c97a67801dea217440f5e1eff9da8b0efca6ece299be75edd61072760d0dfd53f2d06785f72192c29e104354 SHA512 4c387c7cbafd33ffdc3476844e1eb7314d8b8cc8307c51c8291e270cce580845e61c98d39f4fac5661bd20a546eb44ac656f25275cd0f0e92243dd813770c3e2
+EBUILD pyzor-1.0.0_p20211223.ebuild 1548 BLAKE2B 87ea582e181719a0da6a2f0cba5027be0906668a688a93212fdaad0b26ca8ccfe00dcbfbbd141f40d946a49cc5335ed9b9da67169dd4a17157c9e9892e35e703 SHA512 8ce84a4905cb9cb8157d9f9e7bb323db183ab77456ad2ddb405cfe0ac509877d22052997c333ac0ce032c673f5bb64eace886358527972d1b6aef785e3959a5a
 MISC metadata.xml 954 BLAKE2B 62c3a125c862739d03a90657b689242c2e184ffa34b63a59697053cd6385d0d0804c1fa4246146b8fbdb08563d906e4179456b21ee5371889765c53446ebb061 SHA512 1bfbaabcb0b795d2ef3dc4763a46c909c422e23bafd522e072b2d00cc374713c78c005fba26d5df6f8cbbb7a2e411fba36a7741098e17890e4a7dee83b40038f
diff --git a/mail-filter/pyzor/pyzor-1.0.0_p20211223.ebuild b/mail-filter/pyzor/pyzor-1.0.0_p20211223.ebuild
new file mode 100644
index 000000000000..b7766b0cbbe6
--- /dev/null
+++ b/mail-filter/pyzor/pyzor-1.0.0_p20211223.ebuild
@@ -0,0 +1,59 @@
+# 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_COMMIT="2dbe627c1ec245db206cdc73bf1f9d785f1512d8"
+DESCRIPTION="A distributed, collaborative spam detection and filtering network"
+HOMEPAGE="https://github.com/SpamExperts/pyzor"
+SRC_URI="https://github.com/SpamExperts/pyzor/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc gdbm gevent mysql pyzord redis test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	pyzord? (
+		gdbm? ( $(python_gen_impl_dep 'gdbm') )
+		gevent? ( dev-python/gevent[${PYTHON_USEDEP}] )
+		mysql? ( dev-python/mysqlclient[${PYTHON_USEDEP}] )
+		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	)"
+DEPEND="
+	test? (
+		gdbm? ( $(python_gen_impl_dep 'gdbm') )
+		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	)
+"
+
+# TODO: maybe upstream would support skipping tests for which the
+# dependencies are missing?
+REQUIRED_USE="
+	pyzord? ( || ( gdbm redis ) )
+	test? ( gdbm redis )
+"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	pytest -vv tests/unit || die "Tests fail with ${EPYTHON}"
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	if use pyzord; then
+		dodir /usr/sbin
+		mv "${ED}"/usr/bin/pyzord* "${ED}/usr/sbin" \
+		   || die "failed to relocate pyzord"
+	else
+		rm "${ED}"/usr/bin/pyzord* || die "failed to remove pyzord"
+	fi
+}
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index bba31d8a755a..a12e52fb5470 100644
Binary files a/media-fonts/Manifest.gz and b/media-fonts/Manifest.gz differ
diff --git a/media-fonts/liberation-fonts/Manifest b/media-fonts/liberation-fonts/Manifest
index dec68697c8ee..4d80e67b1826 100644
--- a/media-fonts/liberation-fonts/Manifest
+++ b/media-fonts/liberation-fonts/Manifest
@@ -4,5 +4,5 @@ DIST liberation-fonts-2.1.3.tar.gz 4977444 BLAKE2B 1d77ea6a9aa850a3501a7051bf3e3
 DIST liberation-fonts-ttf-2.1.2.tar.gz 2370416 BLAKE2B 386eab6e886b677082bbbe1bf625bf91304e6baa4352a8dba3d073d3d2d80c1ae85ebb456f0b967be7ba9c430d7a95364107e54e789d419605976174ceb751b3 SHA512 bfdc3fb7dff1e78aa833035dad40bc26b12bce24b9e16863ec2f8f768a2a370705fafd25c430e3ed4ba7f742051c52ed3cf14da82a8500797b9efcdeef507f3c
 DIST liberation-fonts-ttf-2.1.3.tar.gz 2370443 BLAKE2B af9039d7586e87b25b05ee80893fb63f0857c05de748a9a9228557556d74cd322c8411672387f6a55b4e6ae2e7c16adb00b6e4d19b6170ce822721845741d0bf SHA512 d988cf02119352f7815327e58ac93ffc2301da66b9afe4427b49ed01edd465dbefd05bf76936035f501d9d38636e97cf243ba87e9f62ca85599ad2c9874a2c77
 EBUILD liberation-fonts-2.1.2.ebuild 1268 BLAKE2B edc049707b4acd486ee7c3619bc5f9f4f6a9b8861e20a0a17e2db4ef7002c5abc1f6cbfa02b8cf4f750be76a9366f309a6ea76c8527b9009efefff1720f6dbe5 SHA512 dfb82d9a5840f8022180f8dee27b1bcbc213eda8695d5c50ff78f46542d2af55af9fab720d4ed354da2c7e0c4e2fb9637884d4db0fe3ba55798c83b682e03065
-EBUILD liberation-fonts-2.1.3.ebuild 1274 BLAKE2B f3242103c761bdb7eae04d134c730dadb31bba39b0f42cd2c83b6c97c31115593bd864ec79a87628ba25eea0065c2fadfc6f327de728512ee989628c9c8650e5 SHA512 5016883f60fcdc9cbf404c21a143a921fe0d66a626688d167a35b407a05f20706229fa87108b17844134828eebf1d5ec1e0a6e6ca188feb1bc80f51d90cbe94b
-MISC metadata.xml 348 BLAKE2B 48542ff2974580db41cdc0be2cca36b72db1ce5fbc3fa9e32799d8c8f27d1821ea56c3b1292d015bd2ba255ba691173a7b89dab6f644bb50e3508fea6d9df802 SHA512 c4d46c9102a2b128fe23dc52e2e23ef838d99a28854f3ca78e4e0ce2aeaa0135a7ac23e503cc49c77b836118c703c494cb59db4da53aea78c3785b36a3a62ec6
+EBUILD liberation-fonts-2.1.3.ebuild 1281 BLAKE2B e3b29638c8679f8f3b91c295b860376870356417d505510b38509b031609cab4671daa415f075985f64014dbdd4822132f5149643a724465dcfc6de80b6ee316 SHA512 79e2021cc17b1586c370aa38cd493b2af01470e731c166907cf21d5760cb76371ec41a14613f5fbe10272c9bfa503bc656bba48da435e8b82b42eae062faae5f
+MISC metadata.xml 372 BLAKE2B e886d18e0829503cda2a92c2fce4d6f16ac3ede48075333687718ed2d042b0b14b18e067396b10241538e11c62c82e677a2bb15dc3a74310eaa0aa350172692d SHA512 6b8d88e17d0fd67bfddf89b7cfc0bc8677a16cd1b75354ccc900d7d5feee76cae6388867a21f4906c1c18a9a503f1dcf876dd36b7e3d8f7b374099a13b08cd20
diff --git a/media-fonts/liberation-fonts/liberation-fonts-2.1.3.ebuild b/media-fonts/liberation-fonts/liberation-fonts-2.1.3.ebuild
index 0bc9e4d62f25..15f6326a8b7b 100644
--- a/media-fonts/liberation-fonts/liberation-fonts-2.1.3.ebuild
+++ b/media-fonts/liberation-fonts/liberation-fonts-2.1.3.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
@@ -13,7 +13,7 @@ SRC_URI="fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/
 	!fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/6060976/${PN}-ttf-${PV}.tar.gz )
 "
 
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~m68k ppc ppc64 ~riscv x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~m68k ppc ppc64 ~riscv x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
 SLOT="0"
 LICENSE="OFL-1.1"
 IUSE="fontforge X"
diff --git a/media-fonts/liberation-fonts/metadata.xml b/media-fonts/liberation-fonts/metadata.xml
index f7a5959f7391..36a94d4b56eb 100644
--- a/media-fonts/liberation-fonts/metadata.xml
+++ b/media-fonts/liberation-fonts/metadata.xml
@@ -8,4 +8,5 @@
 	<use>
 		<flag name="fontforge">Use <pkg>media-gfx/fontforge</pkg> to build fonts from source</flag>
 	</use>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 42750769662e..a71ae8636621 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/chafa/Manifest b/media-gfx/chafa/Manifest
index 30e6e2c960a8..ed7840726caf 100644
--- a/media-gfx/chafa/Manifest
+++ b/media-gfx/chafa/Manifest
@@ -1,3 +1,5 @@
 DIST chafa-1.10.2.tar.xz 512468 BLAKE2B b1edec1ed687f2196a4693fa4cd08d8cabeb2b904abf387001c20ea3b5a9ca94c621bf45c467660342c3f0f049fb9706589c8b13643496b6fa2795276f032f0b SHA512 eaa0a13b1915774f25ed9fe6d7f465e695644c79e96387b71671c43876dad5f703383a876ad4ea2b5a13b2391056224cfe38cecba31264698da37af80ad540b9
+DIST chafa-1.10.3.tar.xz 512808 BLAKE2B cc0d18f06936d3c26a5d073cf8982c5c49bca307833885edf346e392987fb743ee560ca891db5533ee5e856dbeb4ca9f9a68d601961d0ab6b2dcb80c58fdda1d SHA512 29bcd5315a1c5bf08b214b9b58fabc64340e995a383b88e5f8245ba130b0506e4d13c34878d6cb32d1493fa1b8326520cbd176aeef22d932c72ede0430a38fda
 EBUILD chafa-1.10.2.ebuild 751 BLAKE2B 620759963bbe5fa317ad60b080f9138bc9cd1c151cb8ce5c2d6c2d5bd6d774ded495d3956fb6e5d4427740804e91cd326f5257f265f4dec0cdb9b3ec7666e262 SHA512 5c7fee149c9b2130f1d8678b83364257d3209ee3d25bcf4d497b000eb8d75cb2a872117322aa2c1037aea6f0620ae5caf0d45a1c0695d4adf57d877cbd07c47e
+EBUILD chafa-1.10.3.ebuild 754 BLAKE2B b3e92b1cd0f3c81e8626c27031e091ae76e044e15c03d38e1ac9d156a058941deb4a4dca69feca321207ed0738f8e4b0d3a955da340a5fcfd82b9f5be6778c5b SHA512 b9f94e704afcd7177e75c861b0ba9527e974dcb3105cd154ffa98f4a3d288fca9d2c2df360158e336a973fb222ba86fb57559b1fe0c4a767a3624608bdb54c26
 MISC metadata.xml 396 BLAKE2B fc22be32275227f194b224a340dcd08e55a565fa68b102eb9cb55406402ed38d4f593aa6f59f3c40a24480c8d002ea0ce4a9a831055bb6821fdbe1a1dfd103ff SHA512 46617cd84ec16190865a896432df30443d31123b790d871bf634cd446b520ed9b1728951e49217b0619a91d0d46d3013ce7f41e142893298ad7e8c2522d1552d
diff --git a/media-gfx/chafa/chafa-1.10.3.ebuild b/media-gfx/chafa/chafa-1.10.3.ebuild
new file mode 100644
index 000000000000..9a2b941734b1
--- /dev/null
+++ b/media-gfx/chafa/chafa-1.10.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="versatile and fast Unicode/ASCII/ANSI graphics renderer"
+HOMEPAGE="https://hpjansson.org/chafa/ https://github.com/hpjansson/chafa"
+SRC_URI="https://hpjansson.org/chafa/releases/${P}.tar.xz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="+tools"
+
+RDEPEND="
+	dev-libs/glib:2
+	media-gfx/imagemagick:0=
+	tools? ( >=media-libs/freetype-2.0.0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--disable-man \
+		$(use_with tools)
+}
+
+src_install() {
+	local DOCS=( AUTHORS NEWS README TODO )
+	default
+
+	use tools && doman docs/chafa.1
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index b15e813594ec..04eae1cda26c 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -6,6 +6,6 @@ AUX graphite2-1.35-fix-gcc-linking.patch 697 BLAKE2B 3f4f181477e5f2f5db85f0b5c76
 DIST graphite2-1.3.14.tgz 6630061 BLAKE2B 72bf6736aaa8476a89e44ef53c5b6c94f45d815fe1a451ba6b3696bfe023971210975dee4a9c8cb3042f36442e4efecf5baf171ef4230ad2b10694a89865f918 SHA512 14b5eb2ba8158b8b62ffa7fb142100a0af1de0f0c45b2673801b636714a106b46fcd423b05c722d963c9543fafcf10fec811975308211a54f20a3ba322d7b295
 DIST graphite2-1.3.14_p20210810.tar.gz 6656693 BLAKE2B 63a7d96b58f2779d8a4a353e1a986212b884fdf780fedcb83b22dcef2f7678d44c88c14ece2d09dc745df505a4a3825ce61d7c84bd05fd4e98c23d6e86e9326d SHA512 be54c1386578970cf65c1860336a113268181753c1e2a139e37ceeafcfa76e3162086879c54094d70cd0d36ad5852a95390aaa69572d875921e9481f1ae508ff
 EBUILD graphite2-1.3.14-r1.ebuild 2994 BLAKE2B 85a0519e9610d966b043b1ac73c58d17a1cd4729e71369dca175e3ca283a273ae2e00c552372258c20f862c250846d7f29bd252b187a2c12bbaf87595b09d5fa SHA512 8bebde5715ed78ffa35d3466638a00a57009fb16f38c330d1214e6237b4543eac9fa9b3e3919251425699641d504d13262dfd2a8042b8254da04dca6a18c7805
-EBUILD graphite2-1.3.14_p20210810-r1.ebuild 3076 BLAKE2B 6deb2640eff017328f3d38bf8b921085d2a20f15e6e3e1ae381938a275fb1c9df225a5ea8b60dd402afc085a6eaf7c7960c54f360b22c7866a2c6039e2a9a802 SHA512 0d294aa41791c19f6092d37fa2b24836a021c5ad33e587d3e33fced0eb82b52eec5d3cb2bd0fe41db60a0c79746d55f64cbb5783c92c55c7452f87d35574cc43
+EBUILD graphite2-1.3.14_p20210810-r1.ebuild 3083 BLAKE2B 8918442b2f8922fbd1f3467e7c2bb7d9a1437c3bcec15e2f88dbaf11fe2117a88b315489eaf76a439e95ef3f084986976388f28bf3b71317e61ea8e049dd8cb0 SHA512 e27158732ecaa1a04627705446a0c0516dd78d6dcad777b1495b239e0df7c9f5a28bd5528e143826bd1ec6899e6ff47e078c27a294b63cd03c7e18a0c15a1d97
 EBUILD graphite2-1.3.14_p20210810.ebuild 3024 BLAKE2B f99caacdcf8a058683ef8e2ab0d1c26ce783ced212c2bea130193dfa735e0276980d76ba359aba48dab757e37c005e45f89c1c19b6c23743747620985df63ed0 SHA512 e02a9f36ba1a9f9645b5f8132991c4c28342a7d590982afcbe70120f3bfc17518f7e75260590a05fb8bd037932b8e10e2fe871f00e0a414e8b29af92423feccf
 MISC metadata.xml 337 BLAKE2B a406b2f1af9217abda601c1a860904b7897c5646bc145befae7e87038a42e6b60f5290cb7258469de61761b67f74e12eef1e5a632aad219978d021e045eaa6da SHA512 1d7d7bc940d89cad512580d43120946e028c7866f844dbbc9242b0c29bdb1058f181c38eb63bdd50007afb0e95adade98e5a5f234964c1e1dfb8d15bda961c2f
diff --git a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r1.ebuild b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r1.ebuild
index cdccddf64039..db5ce2836552 100644
--- a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r1.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/graphite-${COMMIT}"
 
 LICENSE="LGPL-2.1"
 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"
+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="perl test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 80e97ccd5f31..ac0eb28dd899 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -6,6 +6,8 @@ AUX krita-5.0.0-clang.patch 1645 BLAKE2B 9f02317b40b2408cab46acbe73797c2fea9b71c
 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
 DIST krita-4.4.8.tar.gz 254887779 BLAKE2B 251c621a235b8d977c886d3d31f07187efb6d45eab1960eab84ba4078216a1ecf5c7f0b90bdbf791e0c219867c6df59bb99b47c4b23c7658e1d2990f3e869cdb SHA512 53b9814fcf61fbaee06e81f456aa9de7ab09df99e04932251984c8ae190248e48fa20762bdb7be503ea267e1fb835095b105ce4bf2078fd510ab5a8ef6d82f81
 DIST krita-5.0.2.tar.xz 179049488 BLAKE2B a58ee0e7d654f18509f970d32a680a9a993c7172a3818517ddf0a41f500c2d1f9102a432b728b9d9254f39f1be0c926602e3b1806ae19b6efc49f99becdffcdd SHA512 5dd2d6961feabf20dbcef49f3499281e34b409e96d379b0247eec70449f82c05ed3cf3ca09014535adb7ce66659d58e988f1f054364637c9851181fa8ee926a5
+DIST krita-5.0.6.tar.xz 179335700 BLAKE2B dc164fec0ed39d8c9fc8b3624d0ceaeeb25bb55b32cabf56f655116448cea94451421e67069de1d1fbaed1e949b88c982f3e01cf66de40518d1b4e2b9b079bdb SHA512 7ad92b750a1c54bf79b279730ad84119030ff532f5a8a77f2040776304dbb768a67dfa1bf67ac72c0c984b7e508e59476640f1b41ea38d3f525d52c7eb6cde9f
 EBUILD krita-4.4.8-r1.ebuild 3603 BLAKE2B e3d9d8a9d6060c2b1e621627623668ae29fce652769533ad898064e7f491ee9859fabd9df154bad3346aba37a8a5024061beca045547a87cfb6aa2d8b781ebc1 SHA512 3c3a5b4d98393c6ece66e15b6ca636689da97ce4423855d36d9c02e2fbaa71d51ad91873ae03e47f0fee3c0074307225189b8194a2fa1c4a3472cccb1a6b500d
 EBUILD krita-5.0.2.ebuild 3456 BLAKE2B 03fa9d1f87eea0812835aa88912f84ed9d25c738b71f0dc65f9075f2797d4d2e60824728347884dd69c23bce15666c30e6fd7e2dcdf967bc532f7df83494f3a8 SHA512 a0f4c50826a39e04cf87ace6eddd4a5ab37fdeea3d7c8f8bf53750abf69f1ba73b5c73b5fa0241f6d44ad6c4c2b504fec4a87831ac0c1be9e2045207be0da7a0
+EBUILD krita-5.0.6-r1.ebuild 3417 BLAKE2B a070340934c3359d0391cc9efe8a237a76324ba6bb0018fb2b8c3421cafc985b4492f713d5453cb1fe961683aebfda82c93daf8f8fdc1ce430e8bdb8ce89343c SHA512 2d9013ef45be7f4404e46c725ed711ef482dd4921acf7182553dc280b3884171883e4d3c0e87275a22ed706f5f8e2e6bde91d8aecb812271d21d508317f786dd
 MISC metadata.xml 877 BLAKE2B 529639e044480796204d2338601d4d10ccac0aa83565469b37d838446b4e924b8440c1c3d1eac1473a1220fedea2c49c392c5c99495c27ab7899ed7909666c32 SHA512 6f826baa1918ed944b22944f85304452d34b3a326c615ba8416589facc0208351b25d6eed9a3f8b0f3614db6c3ddd26b0b54554da95aee8ed332f1645d6fda0d
diff --git a/media-gfx/krita/krita-5.0.6-r1.ebuild b/media-gfx/krita/krita-5.0.6-r1.ebuild
new file mode 100644
index 000000000000..dd01742d3d40
--- /dev/null
+++ b/media-gfx/krita/krita-5.0.6-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+PYTHON_COMPAT=( python3_{8..10} )
+KFMIN=5.82.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/"
+
+LICENSE="GPL-3"
+SLOT="5"
+IUSE="color-management fftw gif +gsl heif +jpeg +mypaint-brush-engine openexr pdf qtmedia +raw vc webp"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# bug 630508
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=
+	dev-libs/quazip:0=
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[declarative,gui,widgets,${PYTHON_USEDEP}]
+		dev-python/sip:=[${PYTHON_USEDEP}]
+	')
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=[-gles2-only]
+	>=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/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	media-gfx/exiv2:=
+	media-libs/lcms
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXi
+	color-management? ( >=media-libs/opencolorio-2.0.0 )
+	fftw? ( sci-libs/fftw:3.0= )
+	gif? ( media-libs/giflib )
+	gsl? ( sci-libs/gsl:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	heif? ( >=media-libs/libheif-1.11:= )
+	mypaint-brush-engine? ( media-libs/libmypaint:= )
+	openexr? ( media-libs/openexr:= )
+	pdf? ( app-text/poppler[qt5] )
+	qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
+	raw? ( media-libs/libraw:= )
+	webp? ( >=media-libs/libwebp-1.2.0:= )
+"
+DEPEND="${RDEPEND}
+	vc? ( >=dev-libs/vc-1.1.0 )
+"
+BDEPEND="
+	dev-cpp/eigen:3
+	dev-lang/perl
+	sys-devel/gettext
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_configure() {
+	# Prevent sandbox violation from FindPyQt5.py module
+	# See Gentoo-bug 655918
+	addpredict /dev/dri
+
+	local mycmakeargs=(
+		-DENABLE_UPDATERS=OFF
+		-DFETCH_TRANSLATIONS=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged
+		$(cmake_use_find_package color-management OpenColorIO)
+		$(cmake_use_find_package fftw FFTW3)
+		$(cmake_use_find_package gif GIF)
+		$(cmake_use_find_package gsl GSL)
+		$(cmake_use_find_package heif HEIF)
+		$(cmake_use_find_package jpeg JPEG)
+		$(cmake_use_find_package mypaint-brush-engine LibMyPaint)
+		$(cmake_use_find_package openexr OpenEXR)
+		$(cmake_use_find_package pdf Poppler)
+		$(cmake_use_find_package qtmedia Qt5Multimedia)
+		$(cmake_use_find_package raw LibRaw)
+		$(cmake_use_find_package vc Vc)
+		$(cmake_use_find_package webp WebP)
+	)
+
+	ecm_src_configure
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index d32bd318cb06..44002775e01f 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index be6bac087e7d..80f86cd8f568 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -12,5 +12,5 @@ DIST fontconfig-2.13.93.tar.xz 1418288 BLAKE2B 2be273c21c16f9bb2dfe618177eaf2de4
 DIST fontconfig-2.14.0.tar.xz 1431056 BLAKE2B 880f34d33ac30158ea61e922f6635900c5b244c2eb5d259f7947a364df86ee13f6190f651471b0a28bcd3c13f19c970783517903df374839e474921611dff1ff SHA512 a5257249d031b3cd1a7b1521cd58f48d235a970020da4136a727db5407ec98e74a3776bc467d7e39f30ec664f56ff9fe39068317744a5e737a65109f7a005bfc
 EBUILD fontconfig-2.13.1-r2.ebuild 5605 BLAKE2B e58809be4f34d16eea7cc6f2d66f41de4bcd166b3d598f4304056b8815476a9dbefb100d2aad9593a7bba3cdf5c9e41843a5f76ee8a14165633e019cfc0e11ef SHA512 1677fb0199d018ffe19148823d4640abe7477e6d563a6bf8f54df1fd3d77d31b96271ae3dec689b523ada35c6abdef20c5c65ca8969ef2ae7505908158a16d51
 EBUILD fontconfig-2.13.93.ebuild 6049 BLAKE2B e1a16b3f9f8a4a2ebcc33914a59f4fad3adc65319a60ded78655e1103889c3ad2cf96435b83c0937291dbf2c3a37d85d598e83cdf1df34746ae04c354f29e426 SHA512 acf465d234c792be216b84e37202edcee6432ae043960f81b71dc072a873a38e401ee6edc9591b19967c109107079dbd498c7c749c31d4390c4f0de87a47fe65
-EBUILD fontconfig-2.14.0-r1.ebuild 6710 BLAKE2B 2cbb75c57a8b3fc840bddc2b80ff43d23c6b736bce548db98e5f0991c87eec3b5b65cc2d0076a9da47a22affb8239eb419307dbc048bc41421befe753ee77670 SHA512 42b6e28bb6cec9ff12472ee84282af4428176042ed68ce40b89d060e70bb7a7bb87ec840653e0e51afc3aea63a347bd27bcd33eedb12c5c940fca89a33b5b945
+EBUILD fontconfig-2.14.0-r1.ebuild 6717 BLAKE2B 92dc2093eba618709248a459ace0396c03b53341b76dd1af270de592f0a562223598c61695f0aa87bb21ba2cfe92fc4fe023c9c3d1c5d2f14b1b37fc62f7ad13 SHA512 35dfdaee83adff2f9e33682ed28067862c562c9be8b76b4ed553a1d605c650aad9e1493c5bc74f897f4f61157a1b1cd3dea6c3cac33f017abf631cbfb4e9bd3d
 MISC metadata.xml 599 BLAKE2B c83a7da35bf49bd9bdbcc0adbeed83781250873abf67a927a63fbeb76c4013582cc2363068380b95cb021368bbc0ce92e4dc101f75eb6e3405f07a14d6dc97c3 SHA512 9cc70ac770d70ceef0a24acea4089a949456e229242a2f33f35230505cfa7dc5d20fbf1f2b066c6a1bae53013db6dbabbd22304a3f2a358ec43b6843b22e0a66
diff --git a/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
index 569d95035ed8..e476d074801d 100644
--- a/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz"
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-	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 ~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"
 fi
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 7497012b0177..85eb05d2d504 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -7,6 +7,6 @@ DIST freetype-doc-2.12.1.tar.xz 2038632 BLAKE2B 81225caf1a2c586a8a282a22eaaf2341
 DIST ft2demos-2.12.0.tar.xz 263612 BLAKE2B d0cc154084a28a965798ba34c00368d70163d748f52fe360a6bd920bc9b6b962492efe05b7206b9bc4c4fd4770aa7db4279a287d6ba65a81daf7fc2b7a679a96 SHA512 70176ad89eab0121e9f5610f777da7e2f8478e24fbe9aded7f7fc3d7685019d40a0d0d6b586f3499f8589a2923082e3a9bc8ddc66482b8898642230bff5eaae2
 DIST ft2demos-2.12.1.tar.xz 263656 BLAKE2B fd48dc68bd832e7532e9fae869a19699ab3337e599118bb9f1b76c3bcdcecec3cd3f55f7387508d29baf85b8de4a549aaa0e8af34d988743b1737458e255bdcf SHA512 cd9356152a64d807c75b797d005ca1dd0bde69cc2fadedec101d125cb54b2aaff1f7afa2f20839caba7db66325df7c11ed4883b7e906110356b28d9900caaae7
 EBUILD freetype-2.12.0-r1.ebuild 7567 BLAKE2B 4754c8239a201e8ed1fb307887c6ac513aae84521b2632a99a176e43d16596a1d2ddfb260a598ae11a935d512e9f09dbae652f95f0bb06b49ea411dd26266fe5 SHA512 0dd511f51361c3d6aef8dd4da09d2ca53c704bdd7dd57e91191f884f7e1f5af681c0237a7da8ee1c792a979978104f7f6653cd08897fd43ebd079413efc041a8
-EBUILD freetype-2.12.1.ebuild 7440 BLAKE2B b2476ec8eaa240609a8d0b99e0d748e5e894dc9a980c6cc17487f890ec4aeeb78f24fb3926591d1db4630aa5808f2c1d59c28beb99a32bffc3b932a73fa06901 SHA512 f22c3c74cb92252f6d00c80abe1b1dbc564d8adce9fe14a3abda88a0811ad17ba67c9fcc00d6a93b6ae38ea052506bf49ce103106e9669b422ce6d047161c6ac
+EBUILD freetype-2.12.1.ebuild 7447 BLAKE2B 1caec0c5febded8d74a03454388b7854ff893491bbed4b2f7bc3e78adcea022e10461b7d4ee7fba94f5775ca9dab76d90508c420564ea2b61c1b434b1d5600fc SHA512 0683f7a1916e754649ba2ae993bbb3a8f83dbe91b4668b164008b0cabca728748e735e4cc6f32e9c63de907bd1102a5176650bd48ad2102856533b5bda75563b
 EBUILD freetype-9999.ebuild 7107 BLAKE2B 49c7d1ac429480f097baceba37ba0953b0a7a81a68636a9facee191643e8dce6c794f96e2250e5a17a72972bc8fcc400c24bb7f88f34162176490ab251d8076a SHA512 c4ecfed508b10a050c4d5957583d5fb370110f06753b1d439feedea1f859d11520a6dd2b7c26a0b3d0513ec2d6b6dd40dd13cf143531c548d9f533aa72384730
 MISC metadata.xml 1361 BLAKE2B ec4f7fc1bd3a16f507b0ff18a637849744a5e470a26037a2ef7e0e9a6537408184ca722a003340128f962bcda1cedc044e411c58e5d315602095e1997dccc920 SHA512 16112a7dbc2231ebe0b9cecfd3b91bd966d49de1e04eb72694ef0a22c9495e6a91ac31da7bd027ce90fcda08ca10144d24c4e28b798a1074af147ab0f8b007c7
diff --git a/media-libs/freetype/freetype-2.12.1.ebuild b/media-libs/freetype/freetype-2.12.1.ebuild
index 0ac16abb2e83..7ff4910e41ee 100644
--- a/media-libs/freetype/freetype-2.12.1.ebuild
+++ b/media-libs/freetype/freetype-2.12.1.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
 			mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
-	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 ~x86-winnt"
+	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 ~x86-winnt"
 	IUSE+=" doc"
 else
 	inherit git-r3
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 3bca2ea289d0..289cec276134 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -8,6 +8,6 @@ EBUILD harfbuzz-3.2.0.ebuild 2561 BLAKE2B e495672f81b0d3cc4c3dea9c811b9c305415b7
 EBUILD harfbuzz-3.4.0-r1.ebuild 2626 BLAKE2B 7b50e89680cea5a8eb4dd83428747639d57f8c5978f40504ef28250626c8409fd0b7a3794ba511e02049d14931b93f65215fdfa19c5a9ab6bfca08fe88c2bca9 SHA512 493089edcfdea0f074e83b34c5fd54c1beeddd2762bc5874877081833c0ba74d431f428c2fe1e18cd8436fabedbb39bf9f1f46c8d276e22c2efd61c0b6b43006
 EBUILD harfbuzz-4.1.0.ebuild 2569 BLAKE2B f434eeadafaceda6b51cbf3a47bb1bfdb930950fc5976064744c285708a04f2484d2f2bb85310dd36a177ff3e129c65cd7a09c5417d1cddf699f65c4dc2e22fe SHA512 e62ee2c1623a8a321462ae119aa2485b9e479a66c224961905e2958e9c4cb036a3de399f15ddff9d09619dd6ee8b7d84c295c3d5e15c91af778e04edf969e866
 EBUILD harfbuzz-4.2.0.ebuild 2569 BLAKE2B f434eeadafaceda6b51cbf3a47bb1bfdb930950fc5976064744c285708a04f2484d2f2bb85310dd36a177ff3e129c65cd7a09c5417d1cddf699f65c4dc2e22fe SHA512 e62ee2c1623a8a321462ae119aa2485b9e479a66c224961905e2958e9c4cb036a3de399f15ddff9d09619dd6ee8b7d84c295c3d5e15c91af778e04edf969e866
-EBUILD harfbuzz-4.2.1.ebuild 2569 BLAKE2B f434eeadafaceda6b51cbf3a47bb1bfdb930950fc5976064744c285708a04f2484d2f2bb85310dd36a177ff3e129c65cd7a09c5417d1cddf699f65c4dc2e22fe SHA512 e62ee2c1623a8a321462ae119aa2485b9e479a66c224961905e2958e9c4cb036a3de399f15ddff9d09619dd6ee8b7d84c295c3d5e15c91af778e04edf969e866
+EBUILD harfbuzz-4.2.1.ebuild 2576 BLAKE2B 3921b398fb8bc79f565017c58c0dfa65b719fd973416a28a58e012decab39367c23145b4ee11a00d563e02c9fdb8ea94e4cbbbf423861902760f7a8446500f28 SHA512 1d922c3524ac2ee0ce98e72c2d333ab575d7971b3cf5a5fa60187e433083fe69d826dc614e9ee9a1f98212a27aa3445f4a06bd294e455cdec73d13bde5e33066
 EBUILD harfbuzz-9999.ebuild 2569 BLAKE2B f434eeadafaceda6b51cbf3a47bb1bfdb930950fc5976064744c285708a04f2484d2f2bb85310dd36a177ff3e129c65cd7a09c5417d1cddf699f65c4dc2e22fe SHA512 e62ee2c1623a8a321462ae119aa2485b9e479a66c224961905e2958e9c4cb036a3de399f15ddff9d09619dd6ee8b7d84c295c3d5e15c91af778e04edf969e866
 MISC metadata.xml 818 BLAKE2B 6165990c46a33076cbcb991aa9417b1b1725886c03748d1fbb3f299408d6b56895b66cd723be06f0c72ded731698ca8d16d00cbf7247fafd1291b031aa784cf6 SHA512 141b1399bb3bdb6a5ade1bef685f99e60195edac718b93ec2350ab9e2dad3cc138a3d599c3a2b662a76579309a4f4cff259ef12a194d6a8dfffc4ef74c9102b6
diff --git a/media-libs/harfbuzz/harfbuzz-4.2.1.ebuild b/media-libs/harfbuzz/harfbuzz-4.2.1.ebuild
index 899f139ec716..36d9b9aebfcd 100644
--- a/media-libs/harfbuzz/harfbuzz-4.2.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-4.2.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/libid3tag/Manifest b/media-libs/libid3tag/Manifest
index 192e8d8f7b11..da3623dcb5ed 100644
--- a/media-libs/libid3tag/Manifest
+++ b/media-libs/libid3tag/Manifest
@@ -1,3 +1,5 @@
 DIST libid3tag-0.16.1.tar.gz 98074 BLAKE2B f7acbe4117ef54e5d1705289af3b31ded7e87a7d2ba6e19a02863a391ce4fffee9110011cae42568d7ccbe256f899d7868182f02ed0b662d46f3f78e14c1eb43 SHA512 621cbdf7a0ea5cdca6a9133c88fb07ff0c519ed73bc26a535de3928f4784b912bb44315b45362600d53cd03083b66f38d674d1880ca30e5f6c342321977a6eb2
+DIST libid3tag-0.16.2.tar.gz 53065 BLAKE2B b83a23340c34e23b831b9fee7f28d84ead7ce7b90a789596e22cd252cec67ecb5341e0b750febec96ef0c8f41d78b1028ba93880fcc4bbdb19bae7d3faaa1698 SHA512 93fae5d42ce9dacaa9927692ce9b8447d11c696c07fb74e2966b26be46d57f087e7b64cae8f3321fd9a83a213814fae7df39796f6e6dc1f2e2fdc6165e085b71
 EBUILD libid3tag-0.16.1-r1.ebuild 585 BLAKE2B 5b1597559102c771052c6d99474c94c9bd08105bf9e9137ad02b5dee64c494c9788255e7d8e1367425bc181c13e0eb5f39ede4da981de9451a2b5f595a2d3866 SHA512 c6fccb72d59c70567151dc9dcfc162ee19675c385a7c0176528cb880a4065bfb5d9536320a081268a3b765ac370446121a3577c9594303ef0098af557ccbc236
+EBUILD libid3tag-0.16.2.ebuild 592 BLAKE2B cbd251b04485ebac395b5017ff4647c1f854251bd1325d18139da577b338ceb48364a84449ffa7b4a2b85636f6dbb1b6af72df284063a1f5b36f8fcf0f055552 SHA512 99dd5dad539a099833899bd249345da603f0069cf5bc4f52a425eee3fac28f482820ac3b5bc04d0bc53d31c923204a65fbceeeee57d55897069d1adadb29a6e0
 MISC metadata.xml 327 BLAKE2B a160fc0168c9b0eef874a76a9b6ad1bfbbb2818750ec2d1b14b76f16fd7659fa401889fb5d19a5abc628ed1a6142c9f9b445c3314b58591409b0a31692156630 SHA512 1b879933bdd99c3cab5e88bb24ed77961ec7d4e9f0890fdf9ccc098ca1a95e6c9fe1a7b55f5f0b6c10909ddcf73af7e176228f615998653fc25d9c888af9f8fa
diff --git a/media-libs/libid3tag/libid3tag-0.16.2.ebuild b/media-libs/libid3tag/libid3tag-0.16.2.ebuild
new file mode 100644
index 000000000000..de43e75cf104
--- /dev/null
+++ b/media-libs/libid3tag/libid3tag-0.16.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="The MAD id3tag library, Tenacity fork"
+HOMEPAGE="https://github.com/tenacityteam/libid3tag"
+SRC_URI="https://github.com/tenacityteam/libid3tag/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}" # SOVERSION = ${CMAKE_PROJECT_VERSION} in CMakeLists.txt
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index ad8ed933f78c..9827a331c661 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,4 +1,4 @@
 DIST libpng-1.6.37-apng.patch.gz 10334 BLAKE2B 98660f2c13a78c93f937adf2859447cb0e6fa014b2ef6f0571c910593d94cc0a50137d271dbded0b571a3bc0ce4e9f765be48130ee4ae89884fb7292a1b0cf6e SHA512 a9365257a33d67d7e7284494a37747bb1f3ab89f42a1730f2745c604538f59861828dc91d9bc1d08a5b79ab2f4eef1bb9e438dda1774b3548a1c56be77f8435f
 DIST libpng-1.6.37.tar.xz 1012272 BLAKE2B 48e8f48a88e0db6fcbc0c0f1a4d5bda6e6c8b03255bacdc60e353256ae41ccc01b5b2a7e0e7b0dea236c53a3b9d1dd89d4bb19445afbebc37bf0f92691452424 SHA512 59e8c1059013497ae616a14c3abbe239322d3873c6ded0912403fc62fb260561768230b6ab997e2cccc3b868c09f539fd13635616b9fa0dd6279a3f63ec7e074
-EBUILD libpng-1.6.37-r2.ebuild 1351 BLAKE2B 80d8da8c8884ba9fa526d0e9aa4e5bafb252f63741be0a5a19cdbc09aab1379044d44d4fbf5a0841226c4da2565c8fa932c7eb5721f69f40c55cb115e314ebd7 SHA512 662669111df09cff11631d6bd75ee2f73327128779a0d86622d796fc59e2c337b9d49e3ffd4e7be98f678025e68f3240a399fa3fad2b7af743b7c468da9d982d
+EBUILD libpng-1.6.37-r2.ebuild 1358 BLAKE2B 7c3f016cff4e270addcd3e6b5ba5859f9d9733e60dadb309b4d9a3279abba56f4f1b886bfc1433047f3a82f8139fa66b180215d17f97dea40e5d07b072d0b1d1 SHA512 cb2963cafe245a958278824f882dc2657340203f9b1b584a68347f4a0bbbad4e9a7ff6dec0ed9cdefddec61d20da24874ffa6de1f5d2f40fa9d567876cb6a6b2
 MISC metadata.xml 721 BLAKE2B 71c9fe0c479b2f8269f6a56f6905afb196424d51ca2327e85fb29892ad028cd213e89737974895ca7f621dfe42af8ac0d75c0c572139b7ae7130771a2e3f3f0c SHA512 298a3989e7e7a57af032aea71795fb31387442411e14405ea99ae84c664644ede2248c8a54c3dfa64fed8917a3b2d8715fcd3c8b8d1d9f253f61ede18da29523
diff --git a/media-libs/libpng/libpng-1.6.37-r2.ebuild b/media-libs/libpng/libpng-1.6.37-r2.ebuild
index 38d7b6e61955..c3b5ba86bb88 100644
--- a/media-libs/libpng/libpng-1.6.37-r2.ebuild
+++ b/media-libs/libpng/libpng-1.6.37-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="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng2"
 SLOT="0/16"
-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 ~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="apng cpu_flags_arm_neon cpu_flags_x86_sse static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 695e94baa7be..1407e4f1e8ec 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,14 +1,8 @@
-DIST mesa-21.3.7.tar.xz 16569592 BLAKE2B 7c5a3f144b1ce9e8bbb3560ae2bf46afda9d5c4a3e7b825d406f9a5090dfd51e2b3cc6ee2c10df09c817f5836ffbd09bfc86fbaf63bcc907caef290fd44baee6 SHA512 0991543e9435457fa4d077517408b3f197be32ed61a6c7ca34ddb3906eed208791f1a57227f74115f99df18e612efab1d2c6809b7cf426d273633b53d4aefc88
 DIST mesa-21.3.8.tar.xz 16593540 BLAKE2B 89a471af3354ae0cf0597c1b6bcd2aff8074d58c16504154291f86cd9a9701f98883cf1077f60a8f17d24be800691a5bfb7ef4ddb10dfa355181bf87805b660c SHA512 0462c44fa8e358dafd03088411452bc172a365902795b3198df1e6cfbf1d87675ef5b72b572de7f15e5ee87b30ce5b2f217c81ea72b376962f6428c6ff83f2e9
-DIST mesa-22.0.0.tar.xz 15565680 BLAKE2B 65dd09e1864f353f07ab01cb21cb89f858a071d74043b1913b0abe3ee3b3a992ca3878d40ffe52cc45546770d5ad9e198c93a24a8564ffeb9c8a05da38af300c SHA512 9faef66adbacba24d11dfe8e2d1a753295798883a10a7cc91e6df9d678c64a8286a12e60c0d8576d944a8cc76f00c30d27c3a71d3458bbe3dbcd66c88a454c3b
-DIST mesa-22.0.1.tar.xz 15634448 BLAKE2B c102643a81f47b36da24148564968dd5578b01970d14769eeb501d00ba43f49052893625ac7a8d67638f3d9bfe610440f300eb5657322387d8e5dc15b62f13b2 SHA512 cc8012b8f3fcbecfbb153d0e009e6522c3776023501da8499c06f1eaa9ab0a555ca597e16e4d7a2b954b05c8c0737ae6567e0d8549fb63aa86ae587eb31cd01e
-DIST mesa-22.0.2.tar.xz 15688840 BLAKE2B f2ad5beae09577d87f3c47dacbe5ae13a8674054be3de7e69828ef905cc3f0b4e92f4f96eef44b35f98578a290d0e19a3469b76afd4d4e69c06dbb26a2c16490 SHA512 939ddf9acd280e1b20b3540349b3ad07bbeee5d821198f1d667e86634449bf5d0a0df5832753b8b3f8816709c2f02959cce25f3d26a33cc758dd8e25d158ddb8
-DIST mesa-22.1.0-rc3.tar.xz 15836596 BLAKE2B 8497a74192b80d703f6f87c6411ae24f90a710cf2924b68897eb0d52ac8080d4a76f6224bc912e16d273dee43347420e4b9d54e5e2442a7bf0e409ef5cf656dd SHA512 2ae88d14a8dfdb1b8f720371cb3ce1af775b43a615fd6225b39676948486f4b39c0e9acd989679ea2a12ee803370fd2cd8c1152e8bcec0aa4bbb4e5b7fc78dad
-EBUILD mesa-21.3.7.ebuild 15192 BLAKE2B 647d7b0865d39dd575ae9264cbcdbc07c6f92cda7d8dacbb5ce6bb5c92f0c0b38f322536e486802c8911415ed0e40ad14467bc900d9983e22b917ef1a3c4e75a SHA512 59ed639bd6904ee343f5297bc755ab9bc0dec759459f5b20c7a36c3abc7a3dbb349caca46b7c81909d8d9f0b317525973a24a0486291feeb47356d0d0718606d
-EBUILD mesa-21.3.8.ebuild 15216 BLAKE2B cdbff5f19caf5e784e950f306374d10f2ed61a2ba0b13c7970be201b4c84701bc42a66ec6c45c4701a54e23e1c44072a2c285b33d2d34f6c0e858894cc13eb5b SHA512 4c2eb36699727015f9f1251cf66e0c350f2659c8f91aa0ac3485e1c1c2d2f6d6cfac5a23bdacc1d6acbfc18d74a58b24b417eaa6570dda8df0381043d453217a
-EBUILD mesa-22.0.0.ebuild 12072 BLAKE2B 641589a121140b79cb48fdb9b56c92dea7843f72fa68e0916f39b966985b5884e18e1d734cd65780f7b6b2c7af3b4c60d34320766fe7c929d467ea5308c191dd SHA512 ffc2387028e069ceb90a15dbeac67e88d4597a87ea04b04cb36e7efafccd1e742b6b53c2c3a0c466991b0f9c4a559d18b0fe567f8db8c19fbe30d2cded66af62
-EBUILD mesa-22.0.1.ebuild 12072 BLAKE2B 641589a121140b79cb48fdb9b56c92dea7843f72fa68e0916f39b966985b5884e18e1d734cd65780f7b6b2c7af3b4c60d34320766fe7c929d467ea5308c191dd SHA512 ffc2387028e069ceb90a15dbeac67e88d4597a87ea04b04cb36e7efafccd1e742b6b53c2c3a0c466991b0f9c4a559d18b0fe567f8db8c19fbe30d2cded66af62
-EBUILD mesa-22.0.2.ebuild 12072 BLAKE2B 641589a121140b79cb48fdb9b56c92dea7843f72fa68e0916f39b966985b5884e18e1d734cd65780f7b6b2c7af3b4c60d34320766fe7c929d467ea5308c191dd SHA512 ffc2387028e069ceb90a15dbeac67e88d4597a87ea04b04cb36e7efafccd1e742b6b53c2c3a0c466991b0f9c4a559d18b0fe567f8db8c19fbe30d2cded66af62
-EBUILD mesa-22.1.0_rc3.ebuild 12072 BLAKE2B f4e8f294455b390d7604fd2ada2ddb1ee7cfac6cfce524991f3b3a414fa361e3982f75e16a6db73d25797b9648266aa7ddb2cd29866afea37d867137ea889666 SHA512 e1b97ff79f70cc74604dec9de9ac00fb204ed2cb09f87d81a53a0d11498cc472f02d77a2cb484ed17db2b92d1f533b7da9a56cdb975587f1064dadf5f903ca46
+DIST mesa-22.0.3.tar.xz 15711916 BLAKE2B 2ecf9bc2293861e93abcc66cd5df6651a9eb7e533573273063df76ef01d0a39d6097c7a49ec682439bd6f4f0dfd55cd8e61051a731405759174c55b91dbd7725 SHA512 3982cd2fadca5349b2513885ed734c2422e3f2dced85f471f245b120ffaf018acafcd929dc5ec317f2c568bb5f619f5a3475d3a92495f766a2eefb225efcac14
+DIST mesa-22.1.0-rc4.tar.xz 15852292 BLAKE2B 87b18ab81f58e7778fa0df902a6f020bf9e0e910be7ddc2d7d4af72c68211b7543be8f123a2952c0d640e5c13a277a0ce72c9163d61e7286159ba31ac8854c46 SHA512 755027304eef52b88da94e035c391ed75cdf780099fb5d2c0e4e48b69da3713a9250ba29bbea4e468f280f5112b975cd49fe11a7a89b957c30071bfb0151fc6d
+EBUILD mesa-21.3.8.ebuild 15208 BLAKE2B e383920612d00be64c1f03c445c0e02ebe59fdd03aad6dd6df2d7498f9168ae292e9356ff109bb1c9843b0ecd3c1dfef4b213d54a2b84104779a5759bb410169 SHA512 fe018844f36039c46d1d7a0f85c7756d7b90ea43aa60acb0ae6e728455998e4120ed410ce184161d89cd2e7467166d483d03cf0bd5b31033f4971d53f6cc168b
+EBUILD mesa-22.0.3.ebuild 12032 BLAKE2B 8acd4c2e43d2ca6cf80e7488062e2c49139b4a1b780b92d3df16ef80a69e5af6983fa0adbf32687b7794caf7cfe8f6285dcd4fa76950f7abd9e8fdad6adf1071 SHA512 3506d673f24a5303b3a306e399b17c81ef84570b79754f60b7b8741352fdd6375b745d34ca0d86af12368fc664a4074d6cf92c8d29a585f124f2e3aaf3883a6a
+EBUILD mesa-22.1.0_rc4.ebuild 12072 BLAKE2B f4e8f294455b390d7604fd2ada2ddb1ee7cfac6cfce524991f3b3a414fa361e3982f75e16a6db73d25797b9648266aa7ddb2cd29866afea37d867137ea889666 SHA512 e1b97ff79f70cc74604dec9de9ac00fb204ed2cb09f87d81a53a0d11498cc472f02d77a2cb484ed17db2b92d1f533b7da9a56cdb975587f1064dadf5f903ca46
 EBUILD mesa-9999.ebuild 12181 BLAKE2B b11c4aaeb03b375af654d5fd43dce4f25f2c59824baf597ef1d39295e063b3ea5df9e87740aa840b2bf80b746fb89ae9a1db701afa0d0573dade2b63b050066f SHA512 5c1587ac5bf4c73d5eddd35ff6ed34c84a022dad319335f446708c341d0054005f4857d4a056e1dfdbe08483c54da6934e085595279dc541f2cdc87d113fd6ff
 MISC metadata.xml 1950 BLAKE2B c6d41161e75c88313936009bb7ecc137a22fe7b4c177ca9453f30b5b9e06945e92d11d1c6886a4811dd8772af0ba71b5d4287440f6c9306735129a95d7429b7b SHA512 6073cd6191c9044214bb76297aeb59fce73746b3b382500cbae4ef28f77d9c7cb9383a20ad49503d218f8207dc3c43438de1ba684d40d96469bccc689950c330
diff --git a/media-libs/mesa/mesa-21.3.7.ebuild b/media-libs/mesa/mesa-21.3.7.ebuild
deleted file mode 100644
index f94b6c9c9f55..000000000000
--- a/media-libs/mesa/mesa-21.3.7.ebuild
+++ /dev/null
@@ -1,560 +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 llvm meson-multilib python-any-r1 linux-info
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	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"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} crocus freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	+classic cpu_flags_x86_sse2 d3d9 debug +egl +gallium +gbm gles1 +gles2 +llvm
-	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa xvmc zink +zstd"
-
-REQUIRED_USE="
-	d3d9?   ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	osmesa? ( gallium )
-	vulkan? ( video_cards_radeonsi? ( llvm ) )
-	vulkan-overlay? ( vulkan )
-	wayland? ( egl gbm )
-	video_cards_crocus? ( gallium )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_iris?   ( gallium )
-	video_cards_lima?   ( gallium )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_panfrost? ( gallium )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_v3d? ( gallium )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
-	video_cards_vmware? ( gallium )
-	xa? ( X )
-	xvmc? ( X )
-	zink? ( gallium vulkan )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.107"
-RDEPEND="
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	gallium? (
-		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-		llvm? (
-			video_cards_radeonsi? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_r600? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_radeon? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-		)
-		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-		opencl? (
-					>=virtual/opencl-3[${MULTILIB_USEDEP}]
-					dev-libs/libclc
-					virtual/libelf:0=[${MULTILIB_USEDEP}]
-				)
-		vaapi? (
-			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-		)
-		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	)
-	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="13"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:13[${MULTILIB_USEDEP}]
-		sys-devel/llvm:12[${MULTILIB_USEDEP}]
-		sys-devel/llvm:11[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	gallium? (
-		llvm? (
-			opencl? (
-				video_cards_r600? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${CLANG_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${CLANG_DEPSTR}
-						)
-					)
-				)
-			)
-			!opencl? (
-				video_cards_r600? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${LLVM_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${LLVM_DEPSTR}
-						)
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-	wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	usr/lib*/libglapi.so.0.0.0
-	usr/lib*/libGLESv1_CM.so.1.1.0
-	usr/lib*/libGLESv2.so.2.0.0
-	usr/lib*/libGL.so.1.2.0
-	usr/lib*/libOSMesa.so.8.0.0
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_i965 &&
-		   ! use video_cards_iris &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain freedreno, i965, iris, radeonsi, or v3d"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use gallium; then
-		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
-		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
-		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
-		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
-		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
-		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
-		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-
-	if use osmesa && ! use llvm; then
-		ewarn "OSMesa will be slow without enabling USE=llvm"
-	fi
-}
-
-python_check_deps() {
-	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_i965 ||
-	   use video_cards_iris ||
-	   use video_cards_radeonsi; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use gallium && use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	if use classic; then
-		# Intel code
-		dri_driver_enable video_cards_i915 i915
-		dri_driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			dri_driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		dri_driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		dri_driver_enable video_cards_r100 r100
-		dri_driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-			! use video_cards_r200; then
-			dri_driver_enable video_cards_radeon r100 r200
-		fi
-	fi
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use X || use egl; then
-		emesonargs+=(-Dglvnd=true)
-	else
-		emesonargs+=(-Dglvnd=false)
-	fi
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_feature llvm)
-			$(meson_feature lm-sensors lmsensors)
-			$(meson_feature unwind libunwind)
-		)
-
-		if use video_cards_iris ||
-		   use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use d3d9 gallium-nine))
-		else
-			emesonargs+=(-Dgallium-nine=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-		else
-			emesonargs+=(-Dgallium-va=disabled)
-		fi
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature vdpau gallium-vdpau))
-		else
-			emesonargs+=(-Dgallium-vdpau=disabled)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_feature xa gallium-xa))
-		else
-			emesonargs+=(-Dgallium-xa=disabled)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature xvmc gallium-xvmc))
-		else
-			emesonargs+=(-Dgallium-xvmc=disabled)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_lima ||
-		   use video_cards_panfrost ||
-		   use video_cards_v3d ||
-		   use video_cards_vc4 ||
-		   use video_cards_vivante; then
-			gallium_enable -- kmsro
-		fi
-
-		gallium_enable -- swrast
-		gallium_enable video_cards_lima lima
-		gallium_enable video_cards_panfrost panfrost
-		gallium_enable video_cards_v3d v3d
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable zink zink
-
-		# Only one i915 driver (classic vs gallium). Default to classic.
-		if ! use classic; then
-			gallium_enable video_cards_i915 i915
-			if ! use video_cards_i915 && \
-				! use video_cards_i965; then
-				gallium_enable video_cards_intel i915
-			fi
-		fi
-
-		gallium_enable video_cards_crocus crocus
-		gallium_enable video_cards_iris iris
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-			! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		gallium_enable video_cards_virgl virgl
-
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_freedreno freedreno
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_iris intel
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	local vulkan_layers
-	use vulkan && vulkan_layers+="device-select"
-	use vulkan-overlay && vulkan_layers+=",overlay"
-	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=enabled
-		-Ddri3=enabled
-		$(meson_feature egl)
-		$(meson_feature gbm)
-		$(meson_feature gles1)
-		$(meson_feature gles2)
-		$(meson_use osmesa)
-		$(meson_use selinux)
-		$(meson_feature zstd)
-		$(meson_use video_cards_crocus prefer-crocus)
-		$(meson_use video_cards_iris prefer-iris)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		DRI_DRIVERS+=("$@")
-	fi
-}
-
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-21.3.8.ebuild b/media-libs/mesa/mesa-21.3.8.ebuild
index 082bfd9f9739..3175801c7230 100644
--- a/media-libs/mesa/mesa-21.3.8.ebuild
+++ b/media-libs/mesa/mesa-21.3.8.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/mesa/mesa-22.0.0.ebuild b/media-libs/mesa/mesa-22.0.0.ebuild
deleted file mode 100644
index 15b5138f55fb..000000000000
--- a/media-libs/mesa/mesa-22.0.0.ebuild
+++ /dev/null
@@ -1,463 +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 llvm meson-multilib python-any-r1 linux-info
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	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"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno intel lima nouveau panfrost v3d vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	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"
-
-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 )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.109"
-RDEPEND="
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	llvm? (
-		video_cards_radeonsi? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-	opencl? (
-				>=virtual/opencl-3[${MULTILIB_USEDEP}]
-				dev-libs/libclc
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-	vaapi? (
-		>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-	)
-	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	)
-	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="13"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:13[${MULTILIB_USEDEP}]
-		sys-devel/llvm:12[${MULTILIB_USEDEP}]
-		sys-devel/llvm:11[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-	wayland? ( >=dev-libs/wayland-protocols-1.24 )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-	wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	usr/lib*/libglapi.so.0.0.0
-	usr/lib*/libGLESv1_CM.so.1.1.0
-	usr/lib*/libGLESv2.so.2.0.0
-	usr/lib*/libGL.so.1.2.0
-	usr/lib*/libOSMesa.so.8.0.0
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_intel &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain freedreno, intel, radeonsi, or v3d"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-
-	if use osmesa && ! use llvm; then
-		ewarn "OSMesa will be slow without enabling USE=llvm"
-	fi
-}
-
-python_check_deps() {
-	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_intel ||
-	   use video_cards_radeonsi; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use video_cards_intel ||
-	   use video_cards_r300 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
-		emesonargs+=($(meson_use d3d9 gallium-nine))
-	else
-		emesonargs+=(-Dgallium-nine=false)
-	fi
-
-	if use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature vaapi gallium-va))
-		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-	else
-		emesonargs+=(-Dgallium-va=disabled)
-	fi
-
-	if use video_cards_r300 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature vdpau gallium-vdpau))
-	else
-		emesonargs+=(-Dgallium-vdpau=disabled)
-	fi
-
-	if use video_cards_freedreno ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
-		emesonargs+=($(meson_feature xa gallium-xa))
-	else
-		emesonargs+=(-Dgallium-xa=disabled)
-	fi
-
-	if use video_cards_r600 ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature xvmc gallium-xvmc))
-	else
-		emesonargs+=(-Dgallium-xvmc=disabled)
-	fi
-
-	if use video_cards_freedreno ||
-	   use video_cards_lima ||
-	   use video_cards_panfrost ||
-	   use video_cards_v3d ||
-	   use video_cards_vc4 ||
-	   use video_cards_vivante; then
-		gallium_enable -- kmsro
-	fi
-
-	gallium_enable -- swrast
-	gallium_enable video_cards_freedreno freedreno
-	gallium_enable video_cards_intel crocus i915 iris
-	gallium_enable video_cards_lima lima
-	gallium_enable video_cards_nouveau nouveau
-	gallium_enable video_cards_panfrost panfrost
-	gallium_enable video_cards_v3d v3d
-	gallium_enable video_cards_vc4 vc4
-	gallium_enable video_cards_virgl virgl
-	gallium_enable video_cards_vivante etnaviv
-	gallium_enable video_cards_vmware svga
-	gallium_enable zink zink
-
-	gallium_enable video_cards_r300 r300
-	gallium_enable video_cards_r600 r600
-	gallium_enable video_cards_radeonsi radeonsi
-	if ! use video_cards_r300 && \
-		! use video_cards_r600; then
-		gallium_enable video_cards_radeon r300 r600
-	fi
-
-	# opencl stuff
-	emesonargs+=(
-		-Dgallium-opencl="$(usex opencl icd disabled)"
-	)
-
-	if use vulkan; then
-		vulkan_enable video_cards_freedreno freedreno
-		vulkan_enable video_cards_intel intel
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	local vulkan_layers
-	use vulkan && vulkan_layers+="device-select"
-	use vulkan-overlay && vulkan_layers+=",overlay"
-	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=enabled
-		-Ddri3=enabled
-		-Degl=enabled
-		-Dgbm=enabled
-		-Dglvnd=true
-		$(meson_feature gles1)
-		$(meson_feature gles2)
-		$(meson_feature llvm)
-		$(meson_feature lm-sensors lmsensors)
-		$(meson_use osmesa)
-		$(meson_use selinux)
-		$(meson_feature unwind libunwind)
-		$(meson_feature zstd)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-22.0.1.ebuild b/media-libs/mesa/mesa-22.0.1.ebuild
deleted file mode 100644
index 15b5138f55fb..000000000000
--- a/media-libs/mesa/mesa-22.0.1.ebuild
+++ /dev/null
@@ -1,463 +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 llvm meson-multilib python-any-r1 linux-info
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	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"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno intel lima nouveau panfrost v3d vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	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"
-
-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 )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.109"
-RDEPEND="
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	llvm? (
-		video_cards_radeonsi? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-	opencl? (
-				>=virtual/opencl-3[${MULTILIB_USEDEP}]
-				dev-libs/libclc
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-	vaapi? (
-		>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-	)
-	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	)
-	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="13"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:13[${MULTILIB_USEDEP}]
-		sys-devel/llvm:12[${MULTILIB_USEDEP}]
-		sys-devel/llvm:11[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-	wayland? ( >=dev-libs/wayland-protocols-1.24 )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-	wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	usr/lib*/libglapi.so.0.0.0
-	usr/lib*/libGLESv1_CM.so.1.1.0
-	usr/lib*/libGLESv2.so.2.0.0
-	usr/lib*/libGL.so.1.2.0
-	usr/lib*/libOSMesa.so.8.0.0
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_intel &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain freedreno, intel, radeonsi, or v3d"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-
-	if use osmesa && ! use llvm; then
-		ewarn "OSMesa will be slow without enabling USE=llvm"
-	fi
-}
-
-python_check_deps() {
-	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_intel ||
-	   use video_cards_radeonsi; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use video_cards_intel ||
-	   use video_cards_r300 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
-		emesonargs+=($(meson_use d3d9 gallium-nine))
-	else
-		emesonargs+=(-Dgallium-nine=false)
-	fi
-
-	if use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature vaapi gallium-va))
-		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-	else
-		emesonargs+=(-Dgallium-va=disabled)
-	fi
-
-	if use video_cards_r300 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature vdpau gallium-vdpau))
-	else
-		emesonargs+=(-Dgallium-vdpau=disabled)
-	fi
-
-	if use video_cards_freedreno ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
-		emesonargs+=($(meson_feature xa gallium-xa))
-	else
-		emesonargs+=(-Dgallium-xa=disabled)
-	fi
-
-	if use video_cards_r600 ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature xvmc gallium-xvmc))
-	else
-		emesonargs+=(-Dgallium-xvmc=disabled)
-	fi
-
-	if use video_cards_freedreno ||
-	   use video_cards_lima ||
-	   use video_cards_panfrost ||
-	   use video_cards_v3d ||
-	   use video_cards_vc4 ||
-	   use video_cards_vivante; then
-		gallium_enable -- kmsro
-	fi
-
-	gallium_enable -- swrast
-	gallium_enable video_cards_freedreno freedreno
-	gallium_enable video_cards_intel crocus i915 iris
-	gallium_enable video_cards_lima lima
-	gallium_enable video_cards_nouveau nouveau
-	gallium_enable video_cards_panfrost panfrost
-	gallium_enable video_cards_v3d v3d
-	gallium_enable video_cards_vc4 vc4
-	gallium_enable video_cards_virgl virgl
-	gallium_enable video_cards_vivante etnaviv
-	gallium_enable video_cards_vmware svga
-	gallium_enable zink zink
-
-	gallium_enable video_cards_r300 r300
-	gallium_enable video_cards_r600 r600
-	gallium_enable video_cards_radeonsi radeonsi
-	if ! use video_cards_r300 && \
-		! use video_cards_r600; then
-		gallium_enable video_cards_radeon r300 r600
-	fi
-
-	# opencl stuff
-	emesonargs+=(
-		-Dgallium-opencl="$(usex opencl icd disabled)"
-	)
-
-	if use vulkan; then
-		vulkan_enable video_cards_freedreno freedreno
-		vulkan_enable video_cards_intel intel
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	local vulkan_layers
-	use vulkan && vulkan_layers+="device-select"
-	use vulkan-overlay && vulkan_layers+=",overlay"
-	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=enabled
-		-Ddri3=enabled
-		-Degl=enabled
-		-Dgbm=enabled
-		-Dglvnd=true
-		$(meson_feature gles1)
-		$(meson_feature gles2)
-		$(meson_feature llvm)
-		$(meson_feature lm-sensors lmsensors)
-		$(meson_use osmesa)
-		$(meson_use selinux)
-		$(meson_feature unwind libunwind)
-		$(meson_feature zstd)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-22.0.2.ebuild b/media-libs/mesa/mesa-22.0.3.ebuild
similarity index 99%
rename from media-libs/mesa/mesa-22.0.2.ebuild
rename to media-libs/mesa/mesa-22.0.3.ebuild
index 15b5138f55fb..2ceff3869cbc 100644
--- a/media-libs/mesa/mesa-22.0.2.ebuild
+++ b/media-libs/mesa/mesa-22.0.3.ebuild
@@ -116,7 +116,6 @@ LLVM_DEPSTR="
 	|| (
 		sys-devel/llvm:13[${MULTILIB_USEDEP}]
 		sys-devel/llvm:12[${MULTILIB_USEDEP}]
-		sys-devel/llvm:11[${MULTILIB_USEDEP}]
 	)
 	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
 "
diff --git a/media-libs/mesa/mesa-22.1.0_rc3.ebuild b/media-libs/mesa/mesa-22.1.0_rc4.ebuild
similarity index 100%
rename from media-libs/mesa/mesa-22.1.0_rc3.ebuild
rename to media-libs/mesa/mesa-22.1.0_rc4.ebuild
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index c0bb05fe0ed0..b19fab1d488e 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -6,6 +6,7 @@ AUX opencolorio-1.1.1-Gentoo-specific-OCIOMacros.cmake-remove-LIB_SUFFIX.patch 1
 AUX opencolorio-1.1.1-fix-self-assign-clang.patch 493 BLAKE2B fbe85fc4385556deacd173ab44f5a5cbe32c2cd5b4541f1aaf20037840d5d8c7a61d5c314176cde7d0f08c80b6436b0b937c9fef10c3841948b6881601073df5 SHA512 8132a8352a36994550dd089a4858e11459fcbe0495bd07b6bc599a4b8bb7191da8ca6ae061cd1c04f52f586ac993e3656e8c03c6665f7160fa50b4a117f0cb22
 AUX opencolorio-1.1.1-no-werror.patch 349 BLAKE2B 79788a964466a884754dbdead8e252ff2422a52b56f3da8b0f256a52c714120fd2538b16e476271766a6130b97ec5025859e1320ca0a90c3ef5502fb0005f630 SHA512 d80fc47d8c4a768100cae38edcbf6741583507119d8cd8e2b6620cdc727599e5a1c170380cc25c711279b59c3432782c30315c7ffacbb78fcd1536dc12e3481a
 AUX opencolorio-1.1.1-yaml-cpp-boost-check.patch 1891 BLAKE2B 01331aeef0cde9cf4420f13dc1a2ec2bddf46e519e736a6fb653792074b412ab5d6cca364e4e4619b7b868891eee0786bc0c75df748eb8ac724410e61aa6c52a SHA512 4ddb466a56a27db82f5b83dbb96e42f6b6cf0749168459dd32e922345d6011f09961592f7d5611253cbad5d78952d52f1cdabfed011b4c376faafc0becc7422b
+AUX opencolorio-2.1.1-gcc12.patch 421 BLAKE2B 9a16bf4f0fbf1a2fc277a46b547339415de07c07093f45fd7f4f445735f2c7bda437f75b5f7b30e72fd522af97e4995887312b7828d954ff4bc8a179f476f2c3 SHA512 1738924260ee3abf556207f3323c8cc45e3e5f9210ff46b8b1e9ac1766c39ac06cc50a61d0c77bdf10a318405f6f5dda84d15f4c004be950dce40e2dd3087f2b
 DIST opencolorio-1.1.1.tar.gz 13828483 BLAKE2B f5642f08db84f2b8da44d0dbf58313c78263496fc6f1f209b93fd303bbf9477033317b44eb8bb2b13a70afa19422f4fa312d52a3fa6598031a2aa50b33bbfccf SHA512 bed722f9ddce1887d28aacef2882debccd7c3f3c0c708d2723fea58a097de9f02721af9e85453e089ffda5406aef593ab6536c6886307823c132aa787e492e33
 DIST opencolorio-2.0.1.tar.gz 9945107 BLAKE2B cb4b152205642abd847b7263db838dbb922004017b9f19f7b2bd81d97f64e6f7d008c5a3f734475f510180ae9cc3a84688631e69c0587e0c77599b75b07d9159 SHA512 5787cc4cadb0a1832c925712ca0dfef6e843082b9461460e1798326c6fceaa97bee78e5298651e6a8a3662b348eab5ab9791e94c3efcac337da07229fb559338
 DIST opencolorio-2.0.3.tar.gz 10813503 BLAKE2B a853f2a39b4c3c0005056f0278355f01a8d62ec90054d3f1ce29501ce8fc96628d68eb3d942bb0cc33c71dcaa1a7421684bdd79b190a5eda5c5b5c6b9190017c SHA512 cb8d6d4e2481bfe9449f665ff888ad6ffb2d2e82f1a132b7cd3a74c88b2084f469c362511e57b964d3aee7c1badd41422640ab3a857402fa6a90c8bdf4cc60bb
@@ -14,5 +15,5 @@ EBUILD opencolorio-1.1.1-r3.ebuild 2750 BLAKE2B 22842c149b2d415b04932511630704b7
 EBUILD opencolorio-2.0.1-r2.ebuild 2820 BLAKE2B 7efa8a9aba25285125fce2d7a6ffbe990764cfc5593ef323411547f9c99b351e1511432df6cdad27effa314984f8e81db6606a3f8d958773459074d02fd845ab SHA512 922483a225a736443a67bbcc1e318ca4969be6d161692f0a42bdf88d723f07b6b9b7a398e11af20e68291c956e0ba9825b71554058dbd8adce9dae67b674f7f2
 EBUILD opencolorio-2.0.3.ebuild 2865 BLAKE2B f59dc08bda96088c88cd2108353932f0781610d8c8b2148e4994e4653b8a80fa74585ab516acf04451c6596ef0467e232c487bffa540c2e7ddf18b4e7b835490 SHA512 2ef41f4c4c4d2009dc7624b22091245c1600387f87ae21439ba2e4e3e685e77ecc51a6c323901ecb37fa8e76055c1a591568bd6eb224d85d1e2e1098b5541cda
 EBUILD opencolorio-2.1.1-r2.ebuild 2987 BLAKE2B 84232f4da90329934d2dd430a058ee25cc9b9229f7cb583cd5a2ff103c71eab9a48013612410395c083f7d3cda02fc027f72c29f53753cf142e16736799e48c9 SHA512 59448793311c5833b07f5f7d5894178f92a787d208a08e13c93f3225884f0902e222e6066ae7f7090498a16b6da8a30561f916a4016257c767f4a12e06f0ce42
-EBUILD opencolorio-2.1.1-r7.ebuild 3190 BLAKE2B d49d2bb4d1ec714ef5d43a4488be16d785df6518043fe2fb70b2cb3f7181f6f10da12150c9c250bd8eb3d7ae698b415bf9988b4abac3648f367fd2c6683310c0 SHA512 8cc360bc62150e7ff1a6f4cf059a10bae3dfd6f5a457dd3ca1e1f34875a1d17e0924de77bd63e24b5e257ab2f3d9bea7ae56d2888bde1d3d1cd4270ac2e1efff
+EBUILD opencolorio-2.1.1-r7.ebuild 3235 BLAKE2B fc8fcf4425f54319d1682adbb75d10e826c0427e6e88df3235f8fc5eb0296ad95582d637adca5a4f8edc3acdb819ce5544c88e5da8ce5366c4fbae30959958d5 SHA512 a68e6e983ee08be66d6732304de7c775a4292797c13b350f93bdf4410cb2d47720869c7d4d66514be011df6aea70c407a6ddfccd975c2eef87cddab42f73e54c
 MISC metadata.xml 460 BLAKE2B 564c46a6d12ec479bfbe92401cda933760a3fbfd72b83221f8edc927a01eb5f18ecab877184b95aa5bcc8af20a0c36fbff8c6f45bf7ce2996c795b0f8fac1c9c SHA512 d58b105d94f1f11e52f1e88b9cb24885b5369207c3fa2a6ab4c2133c22e2b47a887a8358b79ea53cc9bdd63a44bb18672e5d26d614074e0bc08539cb4e73b49a
diff --git a/media-libs/opencolorio/files/opencolorio-2.1.1-gcc12.patch b/media-libs/opencolorio/files/opencolorio-2.1.1-gcc12.patch
new file mode 100644
index 000000000000..0bf00862e51b
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-2.1.1-gcc12.patch
@@ -0,0 +1,14 @@
+https://src.fedoraproject.org/rpms/OpenColorIO/raw/rawhide/f/OCIO-strlen.patch
+https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/4fa94918c2cf572dcaf61ca07016f3b5c231c14c
+https://bugs.gentoo.org/841479
+--- a/src/OpenColorIO/FileRules.cpp
++++ b/src/OpenColorIO/FileRules.cpp
+@@ -3,6 +3,7 @@
+ 
+ #include <algorithm>
+ #include <cctype>
++#include <cstring>
+ #include <map>
+ #include <regex>
+ #include <sstream>
+
diff --git a/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild b/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild
index 942486329016..b8d6102d7296 100644
--- a/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild
@@ -55,6 +55,10 @@ RESTRICT="test"
 
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc12.patch
+)
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 1275c535b354..d2f191e5678c 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -2,10 +2,12 @@ DIST openimageio-2.2.18.0.tar.gz 29246567 BLAKE2B cb7297028b39b1616962b94aff61f0
 DIST openimageio-2.2.19.0.tar.gz 29252399 BLAKE2B f90b330944885271e117a01235a48f11e88960f5825d0c84e6e2c994479e76a26bf90e66afec4aae6a5c7164510963027bef79fe0265676ce0993235824d461d SHA512 63951d958daaa4bc62fc210efaeced51affd207be21c938ecd5da70217060bb9c8197bf95813e2fddb728a641e69d2889f9445b7d16653a110e45adf3cb86541
 DIST openimageio-2.3.12.0.tar.gz 32452689 BLAKE2B f5fd428c597b573586a4749b56225ad3c035ab1c2122ff3e93df8e90be5796cc57978aa9fc5b102f2cf64d2407e70a11683b5bbee118c9fac3536b965ed044cc SHA512 c8ec0ead8396717b218d937b9193ef9162c68446f6f1d477f3f0ee4b5656c3d7d53b58bf55aa300fbf57d367a47d795861b5683157e0d0271e0ea56f0460c58d
 DIST openimageio-2.3.13.0.tar.gz 32456755 BLAKE2B 897a7db0eabb9a7cc29ab8fea368c32fc70b63b5ecebbcfa8d1fffe55c2435d9638f8a1f69069c45fad3723a2b7dc40e83971f48892afc631a7593a7629fb92a SHA512 fbefa341a11fd502ec9313ca48a0fe433c5822699e4934f6a14089f670314cbe1c9c0b9a491b1d1927bda0223e38a62192c6ddeec6c4c5e6215a8b3fb6900dd8
+DIST openimageio-2.3.15.0.tar.gz 32626322 BLAKE2B 1367e40dbed3d43b53db1b7117c563782396b255e366ea9586438a5c81cb8ae96ff42a0e445c7932bc92dc327adae921b383c2e6d787dc6e67cf71946d6174c1 SHA512 8ed0303fd9314e01cbf6d45627eb6e88e3fd356387a7657a4b31bbe455a4a493f88a2b511c1d5cf86a9c00346dbc03f9b32d2a6df9da033e7e78e86142ce888c
 DIST openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz 252226183 BLAKE2B b94fb08515e18821e5b88c10031ca53675c56f96397e00b4e186d8dfb9f8557bc935ff102d61835590dca6deeef90dba03b81fd76a7958ab4d0592c042c2130a SHA512 26b9b2cda9d48554b8a53f06bc20301f8ff77dc5e1d7caf9ec45aaaefd8578d3d4d4b2e0a1d1b0f697805fdc0c5d4bae4948cea21821df3006ac0f8b9020f85f
 DIST openimageio-oiio-test-image-b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb.tar.gz 137513393 BLAKE2B ebde02d57daaa58c08c7aab2251c39eefd5b736e1cc4a6d28603d8ee52b7828fa7529c9616207b8b0bcb04d88cd4c60c6325e6f09b4f3410dd6e61c5532b04ad SHA512 840a6785779d85f5da052cb635a92c27451e464414fefd2faaf5fc7a6b78936ff05a6a960c07bb968d7c18e753053ff0f425505de54577d30620fbff9be043fb
 EBUILD openimageio-2.2.18.0-r1.ebuild 4192 BLAKE2B 00a910784e52d4d50a2920641278b41a53847963d9cc0d31badea2e3a3497242f3af9fe6acec43efce043f7acd724ac8f30f475d7697cdfd73b0f39a59e09fcd SHA512 ba24aa74cbe44ab72f8f33397d0d29409d90b8c0263d4551970cb8e35bae4f28fb975414cddf35cb777597c671a8474e81f4b3157194f9c60b3df9bff265a4f8
 EBUILD openimageio-2.2.19.0.ebuild 4205 BLAKE2B ef7cdd667669625a80665df60a203498603704ebdfd8b55eb9f7d4a81dbd62e94401d3e89c086d72f44ee8b82930d89714fdce4a9362925200627220df08365c SHA512 19ed3037b747b83a11ba5bb26f286545db12cb4eda9ac94ce3803f77b45ea37f87f6aa38deea87cf0ae6c955b7dcd34f13881e884254a6ae048111a2b3d5107d
 EBUILD openimageio-2.3.12.0-r3.ebuild 4640 BLAKE2B 7eeca5be1bd3c8e1fc81bf0fd1116aa5448df61d8cacab682a68472171e430c3cc9e1e30640972a927f76770954b5d2491abcde1a1b552bce4695d177971386f SHA512 0bf5d25e8a636a7c1a670d4481d46258f1ed3b6bb33ad64f5203bb0d0f32abf75ab35870f54311b5c4285ef87c383ce88747806269d7659646ff97fa6ea5bd0e
 EBUILD openimageio-2.3.13.0.ebuild 4642 BLAKE2B 74fa8fee521c7fc17e340b5c3932d3a119fb39a76e908a5d48654650651940f0cce2a7cdbe406da51c57e631301d105df4da59fb9c62765f0758abc6fa6eeee5 SHA512 901764f59f9482769688c5bd5fb1a18592197c6cee09889a88dd190206cd84a0028d40355fd8e46e16953ab4e055ed4ff834734283ade41c2354bafb51e2ab5a
+EBUILD openimageio-2.3.15.0.ebuild 4654 BLAKE2B 8686c7931471c93232a81551d477a1db6dce6c0f12439eb23c9f8c39c97186f5688d7744730276b420c163a33f61a2816227077eb2eb18544e3fc7eedb2620d4 SHA512 475e831ad4c82683d31b092734d9fd21e32b35731379598dc82c6b4b2d3029ad7bba36fb5e6f910fa3aa350c5d57c3e8efe2baabd11613523922be3430df937c
 MISC metadata.xml 820 BLAKE2B fd092484e492bc042f5cfdbb717963a12596a00514f986cddccd5b8956891c95b996ac1f5831ab2314f0ee3fbe3fa1905e7601a7b017a9a91f2f7c1aba3a9d8f SHA512 5dfc9f4ab3300f94c611822d1b1badb785cfaeab90bdadf5db5e36d1eb6eff8851123470a1863e1a137f94ea4ce286d2b67f6c3a28cb18d65bb177e1d570b7b4
diff --git a/media-libs/openimageio/openimageio-2.3.15.0.ebuild b/media-libs/openimageio/openimageio-2.3.15.0.ebuild
new file mode 100644
index 000000000000..01a5f74fd9da
--- /dev/null
+++ b/media-libs/openimageio/openimageio-2.3.15.0.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FONT_PN=OpenImageIO
+PYTHON_COMPAT=( python3_{8..10} )
+
+TEST_OIIO_IMAGE_COMMIT="b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb"
+TEST_OEXR_IMAGE_COMMIT="f17e353fbfcde3406fe02675f4d92aeae422a560"
+inherit cmake font python-single-r1
+
+DESCRIPTION="A library for reading and writing images"
+HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
+SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" test? (
+		https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
+		https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
+	)"
+S="${WORKDIR}/oiio-${PV}"
+
+LICENSE="BSD"
+# TODO: drop .1 on next SONAME change (2.3 -> 2.4?) as we needed to nudge it
+# for changing to openexr 3 which broke ABI.
+SLOT="0/$(ver_cut 1-2).1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+X86_CPU_FEATURES=(
+	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype ${CPU_FEATURES[@]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Not quite working yet
+RESTRICT="!test? ( test ) test"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+"
+RDEPEND="
+	>=dev-libs/boost-1.62:=
+	dev-cpp/robin-map
+	dev-libs/libfmt:=
+	dev-libs/pugixml:=
+	>=media-libs/libheif-1.7.0:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.2.1:=
+	>=dev-libs/imath-3.1.2-r4:=
+	>=media-libs/opencolorio-2.1.1-r4:=
+	>=media-libs/openexr-3:0=
+	media-libs/tiff:0=
+	sys-libs/zlib:=
+	dicom? ( sci-libs/dcmtk )
+	ffmpeg? ( media-video/ffmpeg:= )
+	gif? ( media-libs/giflib:0= )
+	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
+	opencv? ( media-libs/opencv:= )
+	opengl? (
+		media-libs/glew:=
+		virtual/glu
+		virtual/opengl
+	)
+	openvdb? (
+		dev-cpp/tbb:=
+		media-gfx/openvdb:=
+	)
+	ptex? ( media-libs/ptex:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pybind11[${PYTHON_USEDEP}]
+		')
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	raw? ( media-libs/libraw:= )
+	truetype? ( media-libs/freetype:2= )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES.md CREDITS.md README.md )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	cmake_comment_add_subdirectory src/fonts
+
+	if use test ; then
+		mkdir -p "${BUILD_DIR}"/testsuite || die
+		mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die
+		mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die
+	fi
+}
+
+src_configure() {
+	# Build with SIMD support
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd} ]] && mysimd=("0")
+
+	local mycmakeargs=(
+		-DVERBOSE=ON
+		-DBUILD_TESTING=$(usex test)
+		-DOIIO_BUILD_TESTS=$(usex test)
+		-DINSTALL_FONTS=OFF
+		-DBUILD_DOCS=$(usex doc)
+		-DINSTALL_DOCS=$(usex doc)
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_CCACHE=OFF
+		-DUSE_DCMTK=$(usex dicom)
+		-DUSE_EXTERNAL_PUGIXML=ON
+		-DUSE_JPEGTURBO=ON
+		-DUSE_NUKE=OFF # not in Gentoo
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-DUSE_GIF=$(usex gif)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENCV=$(usex opencv)
+		-DUSE_OPENGL=$(usex opengl)
+		-DUSE_OPENVDB=$(usex openvdb)
+		-DUSE_PTEX=$(usex ptex)
+		-DUSE_PYTHON=$(usex python)
+		-DUSE_QT=$(usex qt5)
+		-DUSE_LIBRAW=$(usex raw)
+		-DUSE_FREETYPE=$(usex truetype)
+		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
+	)
+	if use python; then
+		mycmakeargs+=(
+			-DPYTHON_VERSION=${EPYTHON#python}
+			-DPYTHON_SITE_DIR=$(python_get_sitedir)
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# can't use font_src_install
+	# it does directory hierarchy recreation
+	FONT_S=(
+		"${S}/src/fonts/Droid_Sans"
+		"${S}/src/fonts/Droid_Sans_Mono"
+		"${S}/src/fonts/Droid_Serif"
+	)
+	insinto ${FONTDIR}
+	for dir in "${FONT_S[@]}"; do
+		doins "${dir}"/*.ttf
+	done
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index bd661f237579..cf4468d25030 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 f5e1e2640b6d..0362d8dfb808 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,7 +1,9 @@
 DIST abcMIDI-2022.03.20.zip 609912 BLAKE2B 8972f6944897d49c1281be9d9b1368278d62fcbfc909651d1fb1347d3efef4ab145f049bac05e11f09118548e9c3c3a753f9367c9e90d933af96e74b71bd6b19 SHA512 138480f0d2a36b573e63a9214d7e2e2109a3e6b55e94999376a333da1978fea0addb5359b0d469d801924d6e039b0eb164a28a9cfad02d73cba1069a29dbfc9b
 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
 EBUILD abcmidi-2022.03.20.ebuild 676 BLAKE2B ce33e38e9ac6f8e8467ce54426cc8438bfc8aa6b21292a98097160afc74c3da4e7d649adbb65beb148bad10703ba3bd7fac998cf519705658fbd172ffb28c333 SHA512 5f0e1b9a3484b499ab963df3d9680fd078c2072145dae9bf6ebb55f6bc3ba43abae758434ef5e162cdb786f67375e4b4f085b133a7b6ae764af9f421d59b9021
 EBUILD abcmidi-2022.04.06.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
 EBUILD abcmidi-2022.04.28.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
+EBUILD abcmidi-2022.05.05.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
 MISC metadata.xml 327 BLAKE2B d92d9b40b1c1af1a4ba5cea8b956a098066ae7cc9eab2cb31a0dfbcc37400558f5f35a6ce04a7541ecbea7578906f688d2931c1f62751e5a2d7bb7b80e97cd2f SHA512 170ca99684768ef2d5b0e8a26e6ca64468b3134847ffe53f6a1efb623bfe77a6c09dfd67df553a306af045a47bc69f0d41ceadf508cce7f75f3c2a7614d2d725
diff --git a/media-sound/abcmidi/abcmidi-2022.05.05.ebuild b/media-sound/abcmidi/abcmidi-2022.05.05.ebuild
new file mode 100644
index 000000000000..11f547f4cb8e
--- /dev/null
+++ b/media-sound/abcmidi/abcmidi-2022.05.05.ebuild
@@ -0,0 +1,35 @@
+# 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/aeolus/Manifest b/media-sound/aeolus/Manifest
index 998234df7580..80d768d3b7e3 100644
--- a/media-sound/aeolus/Manifest
+++ b/media-sound/aeolus/Manifest
@@ -1,4 +1,6 @@
 AUX aeolus-0.9.9-fix-Makefile.patch 612 BLAKE2B d036968f8cefc735d993f4d4a5cb8f177cd026b72cac830c505880e9b09351100705668084b937603a6ef4dd85a39137284fc7f01cfdd7db948c33a733a134ce SHA512 1847ab48321d1d478ec4842fc96f09dcea57799c630f7b49edac0297d7a5c7c21fcd699d3a001801d319e9a4520ad1c6f79494a2dbc91f7ba9a34a38cdcfe01f
+DIST aeolus-0.10.1.tar.bz2 66475 BLAKE2B fa246ee865990b65328ea7a17b7bb29c205ec9b2bdbe4f66f394e2eb3bcf20bfefbd193e684f8e4dbd18a600ab3b445cf4422223bfcbe593ae7357c246cc46ab SHA512 fcc85cbcc8accbbd0e06d7bff3eb3007ca848b4150c036952485ab234e4b58a20fadf2d44133a0632f6fe0b58a67392e3747b474a301c46ae9b2de07bf314467
 DIST aeolus-0.9.9.tar.bz2 66552 BLAKE2B 3e3aafd29477f660cfada1e7bf68e0143c32bebbde26abb653411041741273b7617f580b5c71a5315528d089e9dd9a18c9e56922ffe2a069afd35844b2dd9277 SHA512 423278564e83b00e90b91a408a098de8feb3c03809b2b96cf0b320522206ca1afea1d7f3f5cccad80fc4f03e0f31bb2d19f7256e30e6fbd25d25eb777c669ea2
+EBUILD aeolus-0.10.1.ebuild 1264 BLAKE2B cd5449fd02f5ff19f067b6a2dd6accd92e22125f05302e48177f8981fd3a270d552e2af90049a61ff4e23f3c9bed21e345091cb5ef427367244a36b76b8cba09 SHA512 e9074f3ce1372d1d2e43d046e790b65e137b8bde0e726213dc400c425024b33f3ec6a50239462ba36179e2acfdecc40c4cd25e31aab137ccfd32fcd279a99dbd
 EBUILD aeolus-0.9.9.ebuild 1255 BLAKE2B edd31e3eb988212c7fe3dc5bf127135d875752f408a72ca97e5ec2ea84925d038f254cd9a7156c9728cde0c3aabbae4ee5e75d3315e32e07745b807bf6078db8 SHA512 49c7b8a8588f7f85b6fd28c6c394d1847bb9e27662b27158d113683f449e789898a2745bfd04f05a809f210963fff691af20017eb5c9f4825e7e2011a6674531
 MISC metadata.xml 827 BLAKE2B 2f0a0beb1172d7e417a83bba3bc9f33240585bc4f05f0aa5651889d32a17ca5b8eb519d3fb4753704269cad902a51501c7b776aabf9ebbb3a8a3c2940d777d1a SHA512 6271eb77c2c463f2767651ef23b07db9d8df54f0908aaf1a04e76878fea28453d992a7b7119c7679e64858f30e8d32b498dd4294a670bb5890f8014efb5cb82e
diff --git a/media-sound/aeolus/aeolus-0.10.1.ebuild b/media-sound/aeolus/aeolus-0.10.1.ebuild
new file mode 100644
index 000000000000..7df6c099cec0
--- /dev/null
+++ b/media-sound/aeolus/aeolus-0.10.1.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 flag-o-matic desktop xdg
+
+DESCRIPTION="A synthesised pipe organ emulator"
+HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html"
+SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="
+	virtual/pkgconfig
+"
+CDEPEND="
+	dev-libs/libclthreads
+	media-libs/alsa-lib
+	>=media-libs/zita-alsa-pcmi-0.3
+	sys-libs/readline:0
+	virtual/jack
+	x11-libs/libclxclient
+	x11-libs/libX11
+	x11-libs/libXft
+"
+DEPEND="${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	media-libs/stops
+"
+
+DOCS=( README COPYING AUTHORS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.9-fix-Makefile.patch
+)
+
+src_compile() {
+	cd "${S}"/source || die "Failed to cd to source dir"
+	tc-export CXX
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags xft)
+	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EXPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+	default
+
+	cd "${S}"/source || die "Failed to cd to source dir"
+	emake PREFIX="${D}/usr" install
+	echo "-S ${EPREFIX}/usr/share/stops" > "${T}/aeolus.conf"
+	insinto /etc
+	doins "${T}/aeolus.conf"
+
+	make_desktop_entry aeolus Aeolus "" "AudioVideo"
+}
diff --git a/media-sound/frescobaldi/Manifest b/media-sound/frescobaldi/Manifest
index 4c6df3bae562..a8103d6fac12 100644
--- a/media-sound/frescobaldi/Manifest
+++ b/media-sound/frescobaldi/Manifest
@@ -1,3 +1,5 @@
 DIST frescobaldi-3.1.3.tar.gz 6691789 BLAKE2B 88a08240997aad11d9bf31c57a844a42e341e7641649f5cfb52571beb63fa4c29382136eae7758e5fff1cc6a4f8eb2942ca9b09b8217d7243c699041c951081d SHA512 595c4628df1923dffa44987ba858827a50d5415e9a01b45c87def2a6625d22c8b9b2e988c49dec20bba750cfc1ff4512e6f67875c3a2b23e440ef7231856c159
+DIST frescobaldi-3.2.tar.gz 6696111 BLAKE2B e74a8c3a59c6dc5187538785bc5971dd996cf897c6428ff510775bad58aa4c04dd69b91f3821b9c868a3e7f13b6cae6f76814188de2620542959039e768c9be0 SHA512 403ae6cfe145595fef0ffe06ce4fd595a0417201b19e5f2315944b45cdcec50592296424f2bf2c7e3eccbe3dbeb9ff5bfc4aa7813241d8168bc057e7bf5539b3
 EBUILD frescobaldi-3.1.3.ebuild 821 BLAKE2B f1b1abcd1c40034d0bed504b4f0a95059e215b35e72ecbae6c381be5a7a21b0e0a70aca123112b1b4f216691002091f68f38385c49fa32a21817881127102836 SHA512 bbd92b7bc34b3569545ff5a24067ed9b74af99c8cbfb26cdcc826317283c8f708812e5cf5a1bf0d133f156d678000fcc25733ffe26aa40db7a78fbc9e4307c85
+EBUILD frescobaldi-3.2.ebuild 823 BLAKE2B a0b475c5d2a49a58436b46286d950b5169a1af93a158c742970602893a8b4abedbe306e26ed002a14f299372c1a68b27969c6471c7ab4cf3a88239688a65fb5a SHA512 a251e108bbee52124c66eb61740a39b3290c37aa0b4941e95c0720c9af738be606e69489cac2b2ae15bed94cf478800e5547f35e90ddb4817bca4bb4f81eb1a6
 MISC metadata.xml 438 BLAKE2B d6f42ae0b227211e9000c25a1eb3e371881df6c663891549abd7d878d7cfbf7a9a0e514d2f6b01530667667d4a4c55e7801c3ce5fddc7a13f3ad4448813ff898 SHA512 e94573420812bfbca28fe96cc047eb270ddae4f526fd0d1932893bb06ed3c22de1a76d81ca210cca6cbf7b76ab2ddb74b887a122ea54a92f9b05d1b581165ed9
diff --git a/media-sound/frescobaldi/frescobaldi-3.2.ebuild b/media-sound/frescobaldi/frescobaldi-3.2.ebuild
new file mode 100644
index 000000000000..1b7def16a0ee
--- /dev/null
+++ b/media-sound/frescobaldi/frescobaldi-3.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1 xdg
+
+DESCRIPTION="A LilyPond sheet music text editor"
+HOMEPAGE="https://www.frescobaldi.org/"
+SRC_URI="https://github.com/wbsoft/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-python/PyQt5[gui,network,printsupport,svg,widgets,${PYTHON_USEDEP}]
+	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+	dev-python/python-ly[${PYTHON_USEDEP}]
+	dev-python/python-poppler-qt5[${PYTHON_USEDEP}]
+	media-sound/lilypond"
+RDEPEND="${DEPEND}
+	x11-themes/tango-icon-theme
+"
+
+python_prepare_all() {
+	rm -r frescobaldi_app/icons/Tango || die "failed to remove tango icon theme"
+	distutils-r1_python_prepare_all
+}
diff --git a/media-sound/schismtracker/Manifest b/media-sound/schismtracker/Manifest
index 7bdb7c06c2a2..5f0d50f5a568 100644
--- a/media-sound/schismtracker/Manifest
+++ b/media-sound/schismtracker/Manifest
@@ -1,3 +1,5 @@
 DIST schismtracker-20220125.tar.gz 1309919 BLAKE2B 54fedd4936e51db248b8b237d53b2338488c8332866a221bdd03bc1598aabca80f644052bdc48d8be2f95ad3b10bc6cfc9065a37b62f09df7c0ef4d304a8adde SHA512 c34979cf6cda75a4e5533631b8134b2994a5491f1182b69bfa6e1c97fd2f2e0dc90d883c6184fb24e68e60351e91ca1a2bcccb3708fc0099d0051452b5a44851
+DIST schismtracker-20220506.tar.gz 1310121 BLAKE2B a9740c2a8909a533523de18c8cd4c4457bdaa8f6198598fb0e73089fdb2c7bac3211024d5d9cb695aa5758710d0fa16a407ce0e150d0a3ef0071522f2937eec1 SHA512 8dacd1fd719c20fdc8ef157d1487202a39d4f36a37560ad62680655addde0ceb78bbce51e4f640d3979c91f6a4dfe4bc006785aa35d45a00206773d41adf9f42
 EBUILD schismtracker-20220125.ebuild 1430 BLAKE2B 8c7de70c82a69d2ec57425df0197f13e2a16f01959e86d458f4af586a676975bd9bd81be50b8a190c4be5dd7936790b1221e838ff587ae47354aadd536e24bd7 SHA512 192951e2e5d28c930d7e08fe0056316f0936af63b76f6c41bb095dc353c09869ddebca868db1f07ea2fb46a69d456b244bc5a3285f2143b232884fc21f0ed0a0
+EBUILD schismtracker-20220506.ebuild 1432 BLAKE2B 6deb4efd60e063e0cc0dcad049e14d712cbd4919ed5e54eaec283c3c41fdbd8f54adc3c44e78805b3d2491b970b9074bd4017bd05f6664653a70f9e7d94b454e SHA512 d0f4d36af940ab82414fcdce3c6aac8422e3a0a1697c096a86aa2b8e24e6434a20cfa5ac59d39c1ca2099a29b2d6eb8e779a42b7d9b1cbe92ae1a5ba1ce6eec3
 MISC metadata.xml 356 BLAKE2B d0dafca63357e3b8b2fd8658b79f4f3e62202273f63dd59fbe1cdd7255a66ac2199854ee1adc870cb5b82ae18c294e65a5504163347920480e851a914dcc1fb6 SHA512 5c0f821a6f33b5a06ea18319e989c38714d2cc06bd2049b4e52fef62fdfe93b2e1a2e2c97c4776ebcd9cc10ecd3039b1f805faf5acc63cd20d60d3b4d05d4e3d
diff --git a/media-sound/schismtracker/schismtracker-20220506.ebuild b/media-sound/schismtracker/schismtracker-20220506.ebuild
new file mode 100644
index 000000000000..c5e2f717127a
--- /dev/null
+++ b/media-sound/schismtracker/schismtracker-20220506.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop xdg
+
+DESCRIPTION="Free implementation of Impulse Tracker, a tool used to create high quality music"
+HOMEPAGE="http://schismtracker.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/alsa-lib
+	media-libs/libsdl[X]
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXv
+"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	x11-base/xorg-proto
+"
+
+src_prepare() {
+	default
+	eautoreconf
+
+	sed -e "/^Categories/ s/Audio/AudioVideo;Audio/" -i sys/fd.org/schism.desktop || die
+
+	# workaround for temporary files (missing directory). Fixes:
+	# sh ./scripts/build-font.sh . font/default-lower.fnt font/default-upper-alt.fnt font/default-upper-itf.fnt font/half-width.fnt >auto/default-font.c
+	# /bin/sh: auto/default-font.c: No such file or directory
+	mkdir auto
+
+	#   sys-devel/binutils[multitarget] provides ${CHOST}-windres
+	#   wine provides /usr/bin/windres
+	# and schismtracker fails to use it properly:
+	# sys/win32/schismres.rc:2:20: fatal error: winver.h: No such file or directory
+	[[ ${CHOST} = *mingw32* ]] || export WINDRES= ac_cv_prog_WINDRES= ac_cv_prog_ac_ct_WINDRES=
+}
+
+src_install() {
+	default
+
+	domenu sys/fd.org/*.desktop
+	doicon icons/schism{,-itf}-icon-128.png
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index e18d9780ac89..0505a050e874 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 3c3b271e0e15..4ebf16f67793 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 06 May 2022 16:09:42 +0000
+Sat, 07 May 2022 08:09:43 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index a64cb7b506a6..0b0513d17d68 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-06T16:09:47Z
+TIMESTAMP 2022-05-07T08:09:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmJ1SEtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmJ2KUpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDw2BAAgD9EZdGk+iXbBe3Fecdyik23FHNPdlhCoeeK5I3AetdslvX4xqphrXyN
-oBNLvlYD34xvJj9muccdzAtK7+zlrOmxEsNRx4b7Ov7r91cfGwTlq/SEkLyu0xCE
-DRxDDT9brLwtuHnBS9b17z9KxG3Npa9iM+9JRqXYGI9Exlwte/9JB/06vZIbpVam
-Su7ELxwp13nSHluL6lEuwYJO/AhB9jv/8XB6yM12b0A2buz1uIKOTLfEbwb32kCB
-K5Y3dUa3Ctxuw2F3ZS34Bc0f6uSN919N/WVJv7LtsYmG/Fx0IYKV02dLXQtOxaZD
-raY848ZtLVZMlEpMLCkOovvUB2mVktecQpbc/UDryphECw9ahTuLRGBvWMxkuwtt
-ebHUuhAXuP0ULaXLKm1B5OvSdj8mtUXnLdCXC3pOup3omgWtiShicEz9LaFbLkHw
-DzBwfIzSZ1co4Wz9KUCkkS4DXypZVcOltfaNOhIGfuI6KCQDyVC05jfHeI9so1h7
-c3W88F5UzoxglRxL3i8dYiOKRY19Ib8TBCEOc/ZP7dy/PUW3pfRiimXjIYq12ckH
-9IZ1duNnx3WfUBiSy4D3J+qQ0K0GhR/VMmmB/One298UzZVxMQ+4Y7pGPyYuT1yV
-au5jYLtmurpV4+XGHswGH0o4Zl3hXCEkzDpB25Kp3m/Gk3QV/r8=
-=WTm8
+klCQOQ/8DIuuN+4QzrwR/nC3vXCd+BTYK3q82SUMtY/UqNN8Mj5SFdGPkgQfQPTE
+Ijfng+XDbHdqR+aozeQ9cbxsF4zFWtYYRdrIcEMUtAZ8N1tGfOAmp9sM2EsIoC0g
+qKGgNZJRWmElg4ZUcX+5RpXIVYYFhfJxywvt85P4Wh8x2wmh2RNpm6ClG2KlS/Kr
+aly6YmX985bz/Z48Aj+oB3IH3p76QhB19IIa+RGaPymmbVUGeG9eYXWJfGRG1JLt
+MQoGyCFO0fi8I2o3NzSXz8DZaRPMl1Uvknf58XZUzKWWK9nven6im1SVWgoqDvBS
+GeXhgjln3UtcHpVGx/abHj47ePw5EKGr/na6vHBEHHPoGj3BiSmK0SXydzk94Wye
+4owzSu44royelp2A3igIg4ZRKVQ8JzY2lxdxWoxKvuaZGL7VjmsByxbdPMeGzBe6
+jTVNcD2rxOauOVKel9GDEV+Ug4TWRZQagez7R56+ghZxxt2o2ln5bMf4NA8SecWg
+lz6Fygvp4tQV3hdwFSoZqWSZT5CqxrvXh3wL6+S9N/8/Zdm+uRTfcC0bxhc3JeJX
+5N40NYQrchyVC7HpyvKUTz4T+Ix1YHZMq3uvjKLQs99dWZSiSwzMgSiALU1GXGzs
+Bu8pF4u+4p2bpDoOWIUa/U4mBu+ByKnTFswu98Rf7DYK69gxGS8=
+=5KLV
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 3c3b271e0e15..4ebf16f67793 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 06 May 2022 16:09:42 +0000
+Sat, 07 May 2022 08:09:43 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index e3eeb2bffc6f..d10dfed149f6 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index c7ac2c01a7b7..49f6802c78da 100644
Binary files a/metadata/md5-cache/acct-user/Manifest.gz and b/metadata/md5-cache/acct-user/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-user/miniflux-0 b/metadata/md5-cache/acct-user/miniflux-0
new file mode 100644
index 000000000000..bc51a049f25a
--- /dev/null
+++ b/metadata/md5-cache/acct-user/miniflux-0
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for www-apps/miniflux
+EAPI=8
+INHERIT=acct-user
+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=acct-group/nobody
+SLOT=0
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	ccdfe713e9e8d4a8714f0370512ca086	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_md5_=f494a800ac5f2bc0510974edc9127ab6
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index 2ab43f96d392..a15a5c7268a8 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/edbrowse-3.7.5.1-r3 b/metadata/md5-cache/app-accessibility/edbrowse-3.7.5.1-r3
deleted file mode 100644
index 0a01d218f417..000000000000
--- a/metadata/md5-cache/app-accessibility/edbrowse-3.7.5.1-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-text/htmltidy-5.0.0:= dev-lang/duktape:= dev-libs/libpcre:= net-misc/curl sys-libs/readline:= odbc? ( dev-db/unixODBC )
-DESCRIPTION=Combination editor, browser, and mail client that is 100% text based
-EAPI=7
-HOMEPAGE=http://edbrowse.org
-INHERIT=cmake
-IUSE=odbc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/htmltidy-5.0.0:= dev-lang/duktape:= dev-libs/libpcre:= net-misc/curl sys-libs/readline:= odbc? ( dev-db/unixODBC )
-SLOT=0
-SRC_URI=https://github.com/CMB/edbrowse/archive/v3.7.5.1.tar.gz -> edbrowse-3.7.5.1.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=dfa83627664bc9c8d33279dafc84b7c7
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
new file mode 100644
index 000000000000..b2f86afe34c1
--- /dev/null
+++ b/metadata/md5-cache/app-accessibility/edbrowse-3.8.2.1-r1
@@ -0,0 +1,13 @@
+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-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index b0b0ead2878d..755fdf281e7c 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/salt-3004.1-r4 b/metadata/md5-cache/app-admin/salt-3004.1-r4
index afcfa1b06245..b879dce0a9f6 100644
--- a/metadata/md5-cache/app-admin/salt-3004.1-r4
+++ b/metadata/md5-cache/app-admin/salt-3004.1-r4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.saltstack.com/resources/community/ https://github.com/saltstack
 INHERIT=systemd distutils-r1
 IUSE=cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako mongodb neutron nova openssl portage profile redis selinux test raet +zeromq vim-syntax python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=sys-apps/pciutils >=dev-python/distro-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libnacl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/psutil-5.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pycryptodome-3.9.8[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/markupsafe[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-1.0.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/toml-0.10.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/watchdog[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] libcloud? ( >=dev-python/libcloud-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) mako? ( dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ldap? ( dev-python/python-ldap[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) libvirt? ( python_targets_python3_8? ( dev-python/libvirt-python[python_targets_python3_8(-)?] ) ) openssl? ( dev-libs/openssl:0=[-bindist(-)] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ioflo-1.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/raet-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cheetah? ( >=dev-python/cheetah3-3.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) genshi? ( dev-python/genshi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) mongodb? ( dev-python/pymongo[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) portage? ( sys-apps/portage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) keyring? ( dev-python/keyring[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) redis? ( dev-python/redis-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) selinux? ( sec-policy/selinux-salt ) nova? ( python_targets_python3_8? ( >=dev-python/python-novaclient-2.17.0[python_targets_python3_8(-)?] ) ) neutron? ( python_targets_python3_8? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python3_8(-)?] ) ) gnupg? ( dev-python/python-gnupg[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) profile? ( dev-python/yappi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) vim-syntax? ( app-vim/salt-vim ) zeromq? ( >=dev-python/pyzmq-19.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=|| ( raet zeromq ) test? ( cheetah genshi ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) x86? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-3004.1.tar.gz
 _eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=1dd5dcff8bd6b80356a7b2f35c8efb5f
+_md5_=7a1921c6d330416e218064cf521df675
diff --git a/metadata/md5-cache/app-admin/tpm-1.3.3 b/metadata/md5-cache/app-admin/tpm-1.3.3
new file mode 100644
index 000000000000..302bf00913fc
--- /dev/null
+++ b/metadata/md5-cache/app-admin/tpm-1.3.3
@@ -0,0 +1,11 @@
+BDEPEND=dev-lang/perl
+DEFINED_PHASES=install
+DESCRIPTION=Tiny password manager
+EAPI=8
+HOMEPAGE=https://github.com/nmeum/tpm
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=app-crypt/gnupg
+SLOT=0
+SRC_URI=https://github.com/nmeum/tpm/archive/refs/tags/1.3.3.tar.gz -> tpm-1.3.3.tar.gz
+_md5_=058fc75c0600ea043aa2bc810bc16cde
diff --git a/metadata/md5-cache/app-admin/tpm-9999 b/metadata/md5-cache/app-admin/tpm-9999
new file mode 100644
index 000000000000..f1c39856ff4a
--- /dev/null
+++ b/metadata/md5-cache/app-admin/tpm-9999
@@ -0,0 +1,12 @@
+BDEPEND=dev-lang/perl >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=install unpack
+DESCRIPTION=Tiny password manager
+EAPI=8
+HOMEPAGE=https://github.com/nmeum/tpm
+INHERIT=git-r3
+LICENSE=GPL-3
+PROPERTIES=live
+RDEPEND=app-crypt/gnupg
+SLOT=0
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53
+_md5_=058fc75c0600ea043aa2bc810bc16cde
diff --git a/metadata/md5-cache/app-admin/xstow-1.0.2-r1 b/metadata/md5-cache/app-admin/xstow-1.0.2-r1
new file mode 100644
index 000000000000..4b80de584406
--- /dev/null
+++ b/metadata/md5-cache/app-admin/xstow-1.0.2-r1
@@ -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 postinst prepare
+DEPEND=ncurses? ( sys-libs/ncurses:0= )
+DESCRIPTION=Replacement for GNU stow with extensions
+EAPI=8
+HOMEPAGE=http://xstow.sourceforge.net/
+INHERIT=autotools
+IUSE=ncurses
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=ncurses? ( sys-libs/ncurses:0= )
+SLOT=0
+SRC_URI=mirror://sourceforge/xstow/xstow-1.0.2.tar.bz2
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=e3bb8a88eedfb1219539463b9ff6ca91
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 2b6be61e236a..63ffda9a42f5 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/signing-party-2.10-r1 b/metadata/md5-cache/app-crypt/signing-party-2.10-r1
deleted file mode 100644
index 30780c001ddd..000000000000
--- a/metadata/md5-cache/app-crypt/signing-party-2.10-r1
+++ /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
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-lang/perl app-crypt/libmd
-DESCRIPTION=A collection of several tools related to OpenPGP
-EAPI=7
-HOMEPAGE=https://salsa.debian.org/signing-party-team/signing-party
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl app-crypt/libmd >=app-crypt/gnupg-1.3.92 dev-perl/GnuPG-Interface dev-perl/Text-Template dev-perl/MIME-tools net-mail/qprint >=dev-perl/MailTools-1.62 dev-perl/Net-IDN-Encode virtual/mailx virtual/mta || ( dev-perl/libintl-perl dev-perl/Text-Iconv app-text/recode )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/s/signing-party/signing-party_2.10.orig.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=36cb5ed35450f5c42421357bed1d2412
diff --git a/metadata/md5-cache/app-crypt/signing-party-2.11 b/metadata/md5-cache/app-crypt/signing-party-2.11
index 3350517c2512..65ebd8ef1315 100644
--- a/metadata/md5-cache/app-crypt/signing-party-2.11
+++ b/metadata/md5-cache/app-crypt/signing-party-2.11
@@ -4,10 +4,11 @@ DEPEND=dev-lang/perl app-crypt/libmd
 DESCRIPTION=A collection of several tools related to OpenPGP
 EAPI=7
 HOMEPAGE=https://salsa.debian.org/signing-party-team/signing-party
-KEYWORDS=~amd64 ~ppc ~x86
+INHERIT=toolchain-funcs autotools
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl app-crypt/libmd >=app-crypt/gnupg-1.3.92 dev-perl/GnuPG-Interface dev-perl/Text-Template dev-perl/MIME-tools net-mail/qprint >=dev-perl/MailTools-1.62 dev-perl/Net-IDN-Encode virtual/mailx virtual/mta || ( dev-perl/libintl-perl dev-perl/Text-Iconv app-text/recode )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/signing-party/signing-party_2.11.orig.tar.gz
 _eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=2cc534ceffacb49089c2a4093b98f267
+_md5_=c737cb3b3c2f3d8f835a2253f42b8122
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 496f93f0da0b..91aa9c67bd6c 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/gnucash-docs-4.10.1 b/metadata/md5-cache/app-doc/gnucash-docs-4.10.1
new file mode 100644
index 000000000000..042d09b0cd7f
--- /dev/null
+++ b/metadata/md5-cache/app-doc/gnucash-docs-4.10.1
@@ -0,0 +1,13 @@
+BDEPEND=app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxml2 dev-libs/libxslt sys-devel/make >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Documentation package for GnuCash
+EAPI=8
+HOMEPAGE=https://www.gnucash.org/
+INHERIT=cmake optfeature
+IUSE=l10n_de l10n_it l10n_ja l10n_pt
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2 FDL-1.1
+SLOT=0
+SRC_URI=https://github.com/Gnucash/gnucash-docs/archive/4.10.1.tar.gz -> gnucash-docs-4.10.1.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=be011a487b5d62f6f670180a2934fa56
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 8a7806cd9599..425dc5f9f0a7 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/emacs-23.4-r21 b/metadata/md5-cache/app-editors/emacs-23.4-r21
index e5554ef5c6aa..a61af536f6fa 100644
--- a/metadata/md5-cache/app-editors/emacs-23.4-r21
+++ b/metadata/md5-cache/app-editors/emacs-23.4-r21
@@ -1,15 +1,16 @@
 BDEPEND=virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IDEPEND=app-eselect/eselect-emacs
+INHERIT=autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
 IUSE=alsa aqua athena dbus games gconf gif gpm gtk gui gzip-el jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars Xaw3d xft +xpm
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
+RDEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
 SLOT=23
 SRC_URI=mirror://gnu/emacs/emacs-23.4.tar.bz2 https://dev.gentoo.org/~ulm/emacs/emacs-23.4-patches-23.tar.xz
 _eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	elisp-common	e7aaa047873789f549ea3df2f04b2145	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=ae02fe88c10db19053acc6b39fed4fa8
+_md5_=ea3d8a787a447137aa23930b6a67bd17
diff --git a/metadata/md5-cache/app-editors/emacs-24.5-r11 b/metadata/md5-cache/app-editors/emacs-24.5-r11
index a30663573a12..c3781b763389 100644
--- a/metadata/md5-cache/app-editors/emacs-24.5-r11
+++ b/metadata/md5-cache/app-editors/emacs-24.5-r11
@@ -1,15 +1,16 @@
 BDEPEND=virtual/pkgconfig gzip-el? ( app-arch/gzip ) 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
-DEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IDEPEND=app-eselect/eselect-emacs
+INHERIT=autotools elisp-common flag-o-matic readme.gentoo-r1
 IUSE=acl alsa aqua athena dbus games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
+RDEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
 SLOT=24
 SRC_URI=mirror://gnu/emacs/emacs-24.5.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-24.5-patches-5.tar.xz
 _eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	elisp-common	e7aaa047873789f549ea3df2f04b2145	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=6521480950cba7339ff68371909766b5
+_md5_=c0e6c8b7fa715283b3431f0a5daffc90
diff --git a/metadata/md5-cache/app-editors/emacs-25.3-r11 b/metadata/md5-cache/app-editors/emacs-25.3-r11
index 9ba3ccef4b8c..f6820d2e6ca5 100644
--- a/metadata/md5-cache/app-editors/emacs-25.3-r11
+++ b/metadata/md5-cache/app-editors/emacs-25.3-r11
@@ -1,15 +1,16 @@
 BDEPEND=virtual/pkgconfig gzip-el? ( app-arch/gzip ) 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
-DEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IDEPEND=app-eselect/eselect-emacs
+INHERIT=autotools elisp-common flag-o-matic readme.gentoo-r1
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
+RDEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
 SLOT=25
 SRC_URI=mirror://gnu/emacs/emacs-25.3.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-25.3-patches-3.tar.xz
 _eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	elisp-common	e7aaa047873789f549ea3df2f04b2145	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=6b307b0440bae9f8eaec0d0ea5f0c69f
+_md5_=16c88a5e6c69cd45edfd4115bc475816
diff --git a/metadata/md5-cache/app-editors/emacs-26.3-r6 b/metadata/md5-cache/app-editors/emacs-26.3-r6
deleted file mode 100644
index 22e3aeea3848..000000000000
--- a/metadata/md5-cache/app-editors/emacs-26.3-r6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig gzip-el? ( app-arch/gzip ) 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
-DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
-DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IDEPEND=app-eselect/eselect-emacs
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
-SLOT=26
-SRC_URI=mirror://gnu/emacs/emacs-26.3.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-26.3-patches-1.tar.xz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	elisp-common	e7aaa047873789f549ea3df2f04b2145	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=7fc4e8263b512b03a50b1d4ac392b4de
diff --git a/metadata/md5-cache/app-editors/emacs-26.3-r7 b/metadata/md5-cache/app-editors/emacs-26.3-r7
index daa93aa4abfa..231c62595bf0 100644
--- a/metadata/md5-cache/app-editors/emacs-26.3-r7
+++ b/metadata/md5-cache/app-editors/emacs-26.3-r7
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig gzip-el? ( app-arch/gzip )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IDEPEND=app-eselect/eselect-emacs
 INHERIT=elisp-common flag-o-matic readme.gentoo-r1
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
+RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
 SLOT=26
 SRC_URI=mirror://gnu/emacs/emacs-26.3.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-26.3-patches-2.tar.xz
 _eclasses_=elisp-common	e7aaa047873789f549ea3df2f04b2145	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=1bb7920d5782198ca20225ce5e3725bd
+_md5_=bd4f21e78c40d766ff32e34f3ab9dfe2
diff --git a/metadata/md5-cache/app-editors/emacs-27.2-r5 b/metadata/md5-cache/app-editors/emacs-27.2-r5
index 456a3ffde2ee..7eb9f76c017a 100644
--- a/metadata/md5-cache/app-editors/emacs-27.2-r5
+++ b/metadata/md5-cache/app-editors/emacs-27.2-r5
@@ -1,16 +1,17 @@
 BDEPEND=sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) 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
-DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IDEPEND=app-eselect/eselect-emacs
+INHERIT=autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
+RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
 RESTRICT=test
 SLOT=27
 SRC_URI=mirror://gnu/emacs/emacs-27.2.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-27.2-patches-3.tar.xz
 _eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	elisp-common	e7aaa047873789f549ea3df2f04b2145	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=caaed6edf51471ca171f020c63383631
+_md5_=46dc2414deeb7c5313760f965a1c2812
diff --git a/metadata/md5-cache/app-editors/emacs-28.1 b/metadata/md5-cache/app-editors/emacs-28.1
index 3b0b50841e7e..7878516f9bd7 100644
--- a/metadata/md5-cache/app-editors/emacs-28.1
+++ b/metadata/md5-cache/app-editors/emacs-28.1
@@ -1,16 +1,17 @@
 BDEPEND=sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IDEPEND=app-eselect/eselect-emacs
+INHERIT=elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
+RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
 RESTRICT=test
 SLOT=28
 SRC_URI=mirror://gnu/emacs/emacs-28.1.tar.xz
 _eclasses_=elisp-common	e7aaa047873789f549ea3df2f04b2145	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=119539592efdcdd6941436c11e79a857
+_md5_=d79e34a57e88b78e6fe2619dffe8c5d8
diff --git a/metadata/md5-cache/app-editors/emacs-28.1.9999 b/metadata/md5-cache/app-editors/emacs-28.1.9999
index 7468f903921e..6801c836729a 100644
--- a/metadata/md5-cache/app-editors/emacs-28.1.9999
+++ b/metadata/md5-cache/app-editors/emacs-28.1.9999
@@ -1,15 +1,16 @@
 BDEPEND=sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) 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 unpack
-DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IDEPEND=app-eselect/eselect-emacs
+INHERIT=autotools elisp-common readme.gentoo-r1 toolchain-funcs git-r3
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 PROPERTIES=live
-RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
+RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
 RESTRICT=test
 SLOT=28-vcs
 _eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	elisp-common	e7aaa047873789f549ea3df2f04b2145	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=910ec77c53efcc4f4cd975a67a8d4df4
+_md5_=55e7355ea414709932c65713bfa71ec8
diff --git a/metadata/md5-cache/app-editors/emacs-29.0.9999 b/metadata/md5-cache/app-editors/emacs-29.0.9999
index 1b81290304e3..16a2c123ddaf 100644
--- a/metadata/md5-cache/app-editors/emacs-29.0.9999
+++ b/metadata/md5-cache/app-editors/emacs-29.0.9999
@@ -1,15 +1,16 @@
 BDEPEND=sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) 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 unpack
-DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) webp? ( media-libs/libwebp:0= ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) !aqua? ( gsettings? ( >=dev-libs/glib-2.28.6 ) gtk? ( !X? ( media-libs/fontconfig media-libs/freetype >=x11-libs/cairo-1.12.18 x11-libs/gtk+:3 harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) xwidgets? ( net-libs/webkit-gtk:4= ) ) ) !gtk? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) ) gui? ( !aqua? ( !gtk? ( x11-base/xorg-proto ) X? ( x11-base/xorg-proto ) ) )
+DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) webp? ( media-libs/libwebp:0= ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) !aqua? ( gsettings? ( >=dev-libs/glib-2.28.6 ) gtk? ( !X? ( media-libs/fontconfig media-libs/freetype >=x11-libs/cairo-1.12.18 x11-libs/gtk+:3 harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) xwidgets? ( net-libs/webkit-gtk:4= ) ) ) !gtk? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) ) gui? ( !aqua? ( !gtk? ( x11-base/xorg-proto ) X? ( x11-base/xorg-proto ) ) )
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IDEPEND=app-eselect/eselect-emacs
+INHERIT=autotools elisp-common readme.gentoo-r1 toolchain-funcs git-r3
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars webp wide-int +X Xaw3d xft +xpm xwidgets zlib
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 PROPERTIES=live
-RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) webp? ( media-libs/libwebp:0= ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) !aqua? ( gsettings? ( >=dev-libs/glib-2.28.6 ) gtk? ( !X? ( media-libs/fontconfig media-libs/freetype >=x11-libs/cairo-1.12.18 x11-libs/gtk+:3 harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) xwidgets? ( net-libs/webkit-gtk:4= ) ) ) !gtk? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) ) app-eselect/eselect-emacs
+RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) webp? ( media-libs/libwebp:0= ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) !aqua? ( gsettings? ( >=dev-libs/glib-2.28.6 ) gtk? ( !X? ( media-libs/fontconfig media-libs/freetype >=x11-libs/cairo-1.12.18 x11-libs/gtk+:3 harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) xwidgets? ( net-libs/webkit-gtk:4= ) ) ) !gtk? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) ) app-eselect/eselect-emacs
 RESTRICT=test
 SLOT=29-vcs
 _eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	elisp-common	e7aaa047873789f549ea3df2f04b2145	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=763cd6ccd90ae4dcd3e0aff3af5f0ffa
+_md5_=3f9ac2b4e9e08cbc4a1a07886a22fbec
diff --git a/metadata/md5-cache/app-editors/fe-2.0-r1 b/metadata/md5-cache/app-editors/fe-2.0-r1
index a8e958c03e52..d9024ef399e2 100644
--- a/metadata/md5-cache/app-editors/fe-2.0-r1
+++ b/metadata/md5-cache/app-editors/fe-2.0-r1
@@ -4,6 +4,7 @@ DEPEND=sys-libs/ncurses:0= sendmail? ( virtual/mta )
 DESCRIPTION=A small and easy to use folding editor
 EAPI=8
 HOMEPAGE=http://www.moria.de/~michael/fe/
+INHERIT=autotools toolchain-funcs
 IUSE=sendmail
 KEYWORDS=amd64 ~riscv x86
 LICENSE=GPL-2+
@@ -11,4 +12,4 @@ RDEPEND=sys-libs/ncurses:0= sendmail? ( virtual/mta )
 SLOT=0
 SRC_URI=http://www.moria.de/~michael/fe/fe-2.0.tar.gz
 _eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=db16ce94214048ef853a240ba4ec2e0b
+_md5_=bcc5b4bd5975582114b45764d681002a
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index e6007ad64f2c..95900d48c1bb 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/ecb-2.50_pre20170728 b/metadata/md5-cache/app-emacs/ecb-2.50_pre20170728
index 83d08c7030d0..70f212e8993f 100644
--- a/metadata/md5-cache/app-emacs/ecb-2.50_pre20170728
+++ b/metadata/md5-cache/app-emacs/ecb-2.50_pre20170728
@@ -1,14 +1,13 @@
 BDEPEND=>=app-editors/emacs-23.1:*
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=java? ( app-emacs/jde )
 DESCRIPTION=Source code browser for Emacs
 EAPI=7
 HOMEPAGE=http://ecb.sourceforge.net/
-IUSE=java
+INHERIT=elisp readme.gentoo-r1
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2+
-RDEPEND=java? ( app-emacs/jde ) >=app-editors/emacs-23.1:*
+RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/ecb-2.50_pre20170728.tar.xz
 _eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=b1043286115f9c52bc14b28009a706a8
+_md5_=aca7824ff1468519c38785d386d983f3
diff --git a/metadata/md5-cache/app-emacs/rainbow-mode-1.0.6 b/metadata/md5-cache/app-emacs/rainbow-mode-1.0.6
new file mode 100644
index 000000000000..14e8bfe2e80c
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/rainbow-mode-1.0.6
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-23.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Colorize strings that represent colors inside Emacs buffers
+EAPI=8
+HOMEPAGE=https://elpa.gnu.org/packages/rainbow-mode.html
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-23.1:*
+SLOT=0
+SRC_URI=https://elpa.gnu.org/packages/rainbow-mode-1.0.6.tar
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=c83d5af9d4e46fe4119dabae1e27f37c
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 35cef38b64bb..5e35d62d1b66 100644
Binary files a/metadata/md5-cache/app-eselect/Manifest.gz and b/metadata/md5-cache/app-eselect/Manifest.gz differ
diff --git a/metadata/md5-cache/app-eselect/eselect-fontconfig-20220403 b/metadata/md5-cache/app-eselect/eselect-fontconfig-20220403
index 07ad48f926db..6706c8aebabd 100644
--- a/metadata/md5-cache/app-eselect/eselect-fontconfig-20220403
+++ b/metadata/md5-cache/app-eselect/eselect-fontconfig-20220403
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=An eselect module to manage /etc/fonts/conf.d symlinks
 EAPI=8
 HOMEPAGE=https://gitweb.gentoo.org/proj/eselect-fontconfig.git
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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
 RDEPEND=>=app-admin/eselect-1.2.3
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/app-eselect/eselect-fontconfig/fontconfig.eselect-20220403.xz
-_md5_=e7ba2c71b6437e91ab3083f60c0fea33
+_md5_=646159f743e59cd07dc6310088c90998
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 12043227b5af..a412fdfc4e2d 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-table-others-1.3.12 b/metadata/md5-cache/app-i18n/ibus-table-others-1.3.12
index 182fbe7b2d15..fa4d04d22465 100644
--- a/metadata/md5-cache/app-i18n/ibus-table-others-1.3.12
+++ b/metadata/md5-cache/app-i18n/ibus-table-others-1.3.12
@@ -4,9 +4,9 @@ DEPEND=app-i18n/ibus-table !app-i18n/ibus-table-code !app-i18n/ibus-table-cyrill
 DESCRIPTION=Various tables for IBus-Table
 EAPI=7
 HOMEPAGE=https://github.com/moebiuscurve/ibus-table-others
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=app-i18n/ibus-table !app-i18n/ibus-table-code !app-i18n/ibus-table-cyrillic !app-i18n/ibus-table-latin !app-i18n/ibus-table-tv
 SLOT=0
 SRC_URI=https://github.com/moebiuscurve/ibus-table-others/releases/download/1.3.12/ibus-table-others-1.3.12.tar.gz
-_md5_=de8f92cf620ee16397d0f507da252565
+_md5_=71f21f829a03cbe16737228fc99d41bc
diff --git a/metadata/md5-cache/app-i18n/ibus-table-others-1.3.11 b/metadata/md5-cache/app-i18n/ibus-table-others-1.3.13
similarity index 80%
rename from metadata/md5-cache/app-i18n/ibus-table-others-1.3.11
rename to metadata/md5-cache/app-i18n/ibus-table-others-1.3.13
index 06a0d3361735..1da4521d3a3d 100644
--- a/metadata/md5-cache/app-i18n/ibus-table-others-1.3.11
+++ b/metadata/md5-cache/app-i18n/ibus-table-others-1.3.13
@@ -2,11 +2,11 @@ BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=-
 DEPEND=app-i18n/ibus-table !app-i18n/ibus-table-code !app-i18n/ibus-table-cyrillic !app-i18n/ibus-table-latin !app-i18n/ibus-table-tv
 DESCRIPTION=Various tables for IBus-Table
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/moebiuscurve/ibus-table-others
-KEYWORDS=amd64 x86
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=app-i18n/ibus-table !app-i18n/ibus-table-code !app-i18n/ibus-table-cyrillic !app-i18n/ibus-table-latin !app-i18n/ibus-table-tv
 SLOT=0
-SRC_URI=https://github.com/moebiuscurve/ibus-table-others/releases/download/1.3.11/ibus-table-others-1.3.11.tar.gz
-_md5_=05bb46a6d73c7ab558a860cd35a37001
+SRC_URI=https://github.com/moebiuscurve/ibus-table-others/releases/download/1.3.13/ibus-table-others-1.3.13.tar.gz
+_md5_=ad5fdf50b4eff8f7acb443983115407c
diff --git a/metadata/md5-cache/app-laptop/Manifest.gz b/metadata/md5-cache/app-laptop/Manifest.gz
index 5215421da45b..5739e89a88c1 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/thinkfan-1.3.1 b/metadata/md5-cache/app-laptop/thinkfan-1.3.1
new file mode 100644
index 000000000000..a5b68ea4e81b
--- /dev/null
+++ b/metadata/md5-cache/app-laptop/thinkfan-1.3.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=atasmart? ( dev-libs/libatasmart ) yaml? ( dev-cpp/yaml-cpp )
+DESCRIPTION=Simple fan control program for thinkpads
+EAPI=8
+HOMEPAGE=https://github.com/vmatare/thinkfan
+INHERIT=cmake readme.gentoo-r1
+IUSE=atasmart nvidia +yaml
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=atasmart? ( dev-libs/libatasmart ) yaml? ( dev-cpp/yaml-cpp ) nvidia? ( x11-drivers/nvidia-drivers )
+SLOT=0
+SRC_URI=https://github.com/vmatare/thinkfan/archive/1.3.1.tar.gz -> thinkfan-1.3.1.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=352142c92db14fb5ee53525511ce87ea
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index eb97c9678faa..b84458a4352e 100644
Binary files a/metadata/md5-cache/app-metrics/Manifest.gz and b/metadata/md5-cache/app-metrics/Manifest.gz differ
diff --git a/metadata/md5-cache/app-metrics/ceph_exporter-2.0.7 b/metadata/md5-cache/app-metrics/ceph_exporter-2.0.7
new file mode 100644
index 000000000000..38a367036a92
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/ceph_exporter-2.0.7
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.10
+DEFINED_PHASES=compile install unpack
+DEPEND=acct-group/ceph acct-user/ceph =sys-cluster/ceph-14*
+DESCRIPTION=Prometheus exporter that scrapes metrics from a ceph cluster
+EAPI=7
+HOMEPAGE=https://github.com/digitalocean/ceph_exporter
+INHERIT=golang-vcs-snapshot
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/ceph acct-user/ceph =sys-cluster/ceph-14*
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/digitalocean/ceph_exporter/archive/2.0.7-luminous.tar.gz -> ceph_exporter-2.0.7.tar.gz
+_eclasses_=golang-base	9f0e420ab37bc55a318d74bab3aae891	golang-vcs-snapshot	6864f899c6843043ba23620fcd4a908c
+_md5_=048a269917095623b019b94adf618890
diff --git a/metadata/md5-cache/app-metrics/ceph_exporter-3.0.0 b/metadata/md5-cache/app-metrics/ceph_exporter-3.0.0
new file mode 100644
index 000000000000..964d69bfb8f1
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/ceph_exporter-3.0.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.10
+DEFINED_PHASES=compile install unpack
+DEPEND=acct-group/ceph acct-user/ceph =sys-cluster/ceph-15*
+DESCRIPTION=Prometheus exporter that scrapes metrics from a ceph cluster
+EAPI=7
+HOMEPAGE=https://github.com/digitalocean/ceph_exporter
+INHERIT=golang-vcs-snapshot
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/ceph acct-user/ceph =sys-cluster/ceph-15*
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/digitalocean/ceph_exporter/archive/3.0.0-nautilus.tar.gz -> ceph_exporter-3.0.0.tar.gz
+_eclasses_=golang-base	9f0e420ab37bc55a318d74bab3aae891	golang-vcs-snapshot	6864f899c6843043ba23620fcd4a908c
+_md5_=e19d920332df8b666fd331f160f04895
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 0233f733b078..607664274c8a 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/nnn-4.5 b/metadata/md5-cache/app-misc/nnn-4.5
new file mode 100644
index 000000000000..725dcbd89132
--- /dev/null
+++ b/metadata/md5-cache/app-misc/nnn-4.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
+DESCRIPTION=The missing terminal file browser for X
+EAPI=8
+HOMEPAGE=https://github.com/jarun/nnn
+INHERIT=bash-completion-r1 toolchain-funcs xdg-utils
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
+SLOT=0
+SRC_URI=https://github.com/jarun/nnn/archive/v4.5.tar.gz -> nnn-4.5.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=8fa9cfde078f7f20be73d6a02b5ebe73
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 64ce7a74ee65..b96acc31ec3e 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/gnucash-4.10 b/metadata/md5-cache/app-office/gnucash-4.10
new file mode 100644
index 000000000000..d318b1b7cd9a
--- /dev/null
+++ b/metadata/md5-cache/app-office/gnucash-4.10
@@ -0,0 +1,18 @@
+BDEPEND=dev-lang/swig dev-util/cmake virtual/pkgconfig || ( >=sys-devel/gcc-8:* >=sys-devel/clang-6:* ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-libs/glib-2.56.1:2 >=dev-scheme/guile-2.2.0:=[regex] >=sys-libs/zlib-1.1.4 dev-libs/boost:=[icu,nls] dev-libs/icu:= dev-libs/libxml2:2 dev-libs/libxslt aqbanking? ( >=net-libs/aqbanking-6[ofx?] sys-libs/gwenhywfar:= smartcard? ( sys-libs/libchipcard ) ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gui? ( >=x11-libs/gtk+-3.22.30:3 gnome-base/dconf net-libs/webkit-gtk:4= aqbanking? ( sys-libs/gwenhywfar:=[gtk] ) ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) ofx? ( >=dev-libs/libofx-0.9.1:= ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) 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(-)] ) ) quotes? ( >=dev-perl/Finance-Quote-1.11 dev-perl/Date-Manip dev-perl/HTML-TableExtract ) sqlite? ( dev-db/libdbi dev-db/libdbi-drivers[sqlite] ) >=dev-cpp/gtest-1.8.0 >=sys-devel/gettext-0.20 dev-lang/perl dev-perl/XML-Parser sys-devel/libtool
+DESCRIPTION=A personal finance manager
+EAPI=8
+HOMEPAGE=https://www.gnucash.org/
+INHERIT=cmake gnome2-utils python-single-r1 xdg-utils
+IUSE=aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres python quotes register2 smartcard sqlite test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=doc? ( ~app-doc/gnucash-docs-4.10.1 gnome-extra/yelp )
+RDEPEND=>=dev-libs/glib-2.56.1:2 >=dev-scheme/guile-2.2.0:=[regex] >=sys-libs/zlib-1.1.4 dev-libs/boost:=[icu,nls] dev-libs/icu:= dev-libs/libxml2:2 dev-libs/libxslt aqbanking? ( >=net-libs/aqbanking-6[ofx?] sys-libs/gwenhywfar:= smartcard? ( sys-libs/libchipcard ) ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gui? ( >=x11-libs/gtk+-3.22.30:3 gnome-base/dconf net-libs/webkit-gtk:4= aqbanking? ( sys-libs/gwenhywfar:=[gtk] ) ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) ofx? ( >=dev-libs/libofx-0.9.1:= ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) 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(-)] ) ) quotes? ( >=dev-perl/Finance-Quote-1.11 dev-perl/Date-Manip dev-perl/HTML-TableExtract ) sqlite? ( dev-db/libdbi dev-db/libdbi-drivers[sqlite] )
+REQUIRED_USE=examples? ( gui ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) smartcard? ( aqbanking )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Gnucash/gnucash/releases/download/4.10/gnucash-4.10.tar.bz2
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=d97cee8a321dcd1b40882ee97596d4d8
diff --git a/metadata/md5-cache/app-office/lyx-2.3.6.1-r2 b/metadata/md5-cache/app-office/lyx-2.3.6.1-r2
new file mode 100644
index 000000000000..0a1da20d9697
--- /dev/null
+++ b/metadata/md5-cache/app-office/lyx-2.3.6.1-r2
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/bc virtual/pkgconfig nls? ( sys-devel/gettext ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEFINED_PHASES=configure install postinst postrm 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 ) app-text/mythes dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-texlive/texlive-fontsextra sys-apps/file sys-libs/zlib virtual/imagemagick-tools[png,svg?] x11-misc/xdg-utils aspell? ( app-text/aspell ) cups? ( net-print/cups ) dia? ( app-office/dia ) dot? ( media-gfx/graphviz ) enchant? ( app-text/enchant:2 ) gnumeric? ( app-office/gnumeric ) html? ( dev-tex/html2latex ) hunspell? ( app-text/hunspell ) l10n_he? ( dev-tex/culmus-latex ) latex? ( app-text/dvipng app-text/ghostscript-gpl app-text/ps2eps app-text/texlive dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience dev-texlive/texlive-pictures dev-texlive/texlive-plaingeneric || ( dev-tex/hevea dev-tex/latex2html dev-tex/tex4ht[java] dev-tex/tth ) ) rcs? ( dev-vcs/rcs ) rtf? ( app-text/unrtf dev-tex/html2latex dev-tex/latex2rtf ) svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) ) dev-qt/qtconcurrent:5
+DESCRIPTION=WYSIWYM frontend for LaTeX, DocBook, etc
+EAPI=7
+HOMEPAGE=https://www.lyx.org/
+INHERIT=desktop font python-single-r1 qmake-utils toolchain-funcs xdg-utils
+IUSE=aspell cups debug dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf svg l10n_he X python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+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 ) app-text/mythes dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-texlive/texlive-fontsextra sys-apps/file sys-libs/zlib virtual/imagemagick-tools[png,svg?] x11-misc/xdg-utils aspell? ( app-text/aspell ) cups? ( net-print/cups ) dia? ( app-office/dia ) dot? ( media-gfx/graphviz ) enchant? ( app-text/enchant:2 ) gnumeric? ( app-office/gnumeric ) html? ( dev-tex/html2latex ) hunspell? ( app-text/hunspell ) l10n_he? ( dev-tex/culmus-latex ) latex? ( app-text/dvipng app-text/ghostscript-gpl app-text/ps2eps app-text/texlive dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience dev-texlive/texlive-pictures dev-texlive/texlive-plaingeneric || ( dev-tex/hevea dev-tex/latex2html dev-tex/tex4ht[java] dev-tex/tth ) ) rcs? ( dev-vcs/rcs ) rtf? ( app-text/unrtf dev-tex/html2latex dev-tex/latex2rtf ) svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/lyx-2.3.6.1.tar.xz ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.3/lyx-2.3.6.1/lyx-2.3.6.1.tar.xz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	font	d31f12a0f6e13d56dc3062e76ae58a61	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=a452695de4cdf4218aa35912cc3e366a
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 44105a5755bb..35be5cb88753 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/bash-completion-2.11 b/metadata/md5-cache/app-shells/bash-completion-2.11
index 703ceb165d03..062124d19a93 100644
--- a/metadata/md5-cache/app-shells/bash-completion-2.11
+++ b/metadata/md5-cache/app-shells/bash-completion-2.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst prepare setup test
-DEPEND=test? ( >=app-shells/bash-4.3_p30-r1:0 sys-apps/miscfiles !!net-fs/mc || ( ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/pexpect[python_targets_python3_9(-)] dev-python/pytest[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/pexpect[python_targets_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)] ) ) )
+DEPEND=test? ( >=app-shells/bash-4.3_p30-r1:0 sys-apps/miscfiles !!net-fs/mc || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/pexpect[python_targets_python3_10(-)] dev-python/pytest[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/pexpect[python_targets_python3_9(-)] dev-python/pytest[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/pexpect[python_targets_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)] ) ) )
 DESCRIPTION=Programmable Completion for bash
 EAPI=7
 HOMEPAGE=https://github.com/scop/bash-completion
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/scop/bash-completion/releases/download/2.11/bash-completion-2.11.tar.xz eselect? ( https://github.com/mgorny/bashcomp2/releases/download/v2.0.3/bashcomp-2.0.3.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	user-info	69a1ed744ec33cf2c910ff2bd6084d11
-_md5_=efda720dde68cd41d9bd489cdcd8b6c6
+_md5_=843271ab8fa8982bd6b9c6bbf8ac4c6f
diff --git a/metadata/md5-cache/app-shells/bash-completion-9999 b/metadata/md5-cache/app-shells/bash-completion-9999
index 224491da4884..f86b09fac421 100644
--- a/metadata/md5-cache/app-shells/bash-completion-9999
+++ b/metadata/md5-cache/app-shells/bash-completion-9999
@@ -1,6 +1,6 @@
 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=install postinst prepare setup test unpack
-DEPEND=test? ( >=app-shells/bash-4.3_p30-r1:0 sys-apps/miscfiles !!net-fs/mc || ( ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/pexpect[python_targets_python3_9(-)] dev-python/pytest[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/pexpect[python_targets_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)] ) ) )
+DEPEND=test? ( >=app-shells/bash-4.3_p30-r1:0 sys-apps/miscfiles !!net-fs/mc || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/pexpect[python_targets_python3_10(-)] dev-python/pytest[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/pexpect[python_targets_python3_9(-)] dev-python/pytest[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/pexpect[python_targets_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)] ) ) )
 DESCRIPTION=Programmable Completion for bash
 EAPI=7
 HOMEPAGE=https://github.com/scop/bash-completion
@@ -13,4 +13,4 @@ RDEPEND=>=app-shells/bash-4.3_p30-r1:0 sys-apps/miscfiles !!net-fs/mc
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	user-info	69a1ed744ec33cf2c910ff2bd6084d11
-_md5_=05fa5c61ea0cafcf7acf9554518614a4
+_md5_=65319e958a3b1590f6629c15ca272329
diff --git a/metadata/md5-cache/app-shells/pwsh-bin-7.1.4 b/metadata/md5-cache/app-shells/pwsh-bin-7.1.4
deleted file mode 100644
index f2cde7528ee4..000000000000
--- a/metadata/md5-cache/app-shells/pwsh-bin-7.1.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PowerShell - binary precompiled for glibc
-EAPI=7
-HOMEPAGE=https://powershell.org/
-IUSE=+pwsh-symlink
-KEYWORDS=~amd64 ~arm ~arm64
-LICENSE=MIT
-RDEPEND=app-crypt/mit-krb5:0/0 dev-util/lttng-ust:0 || ( dev-libs/openssl-compat:1.0.0 =dev-libs/openssl-1.0*:0/0 ) sys-libs/pam:0/0 sys-libs/zlib:0/1 pwsh-symlink? ( !app-shells/pwsh )
-REQUIRED_USE=elibc_glibc
-SLOT=0
-SRC_URI=amd64? ( https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/powershell-7.1.4-linux-x64.tar.gz ) arm? ( https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/powershell-7.1.4-linux-arm32.tar.gz ) arm64? ( https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/powershell-7.1.4-linux-arm64.tar.gz )
-_md5_=d64e15fcfb2a63b5830e7b33962f09c4
diff --git a/metadata/md5-cache/app-shells/pwsh-bin-7.2.0 b/metadata/md5-cache/app-shells/pwsh-bin-7.2.0
deleted file mode 100644
index d09191b1dfea..000000000000
--- a/metadata/md5-cache/app-shells/pwsh-bin-7.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PowerShell - binary precompiled for glibc
-EAPI=7
-HOMEPAGE=https://powershell.org/
-IUSE=+pwsh-symlink
-KEYWORDS=~amd64 ~arm ~arm64
-LICENSE=MIT
-RDEPEND=app-crypt/mit-krb5:0/0 dev-util/lttng-ust:0 || ( dev-libs/openssl-compat:1.0.0 =dev-libs/openssl-1.0*:0/0 ) sys-libs/pam:0/0 sys-libs/zlib:0/1 pwsh-symlink? ( !app-shells/pwsh )
-REQUIRED_USE=elibc_glibc
-SLOT=0
-SRC_URI=amd64? ( https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell-7.2.0-linux-x64.tar.gz ) arm? ( https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell-7.2.0-linux-arm32.tar.gz ) arm64? ( https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell-7.2.0-linux-arm64.tar.gz )
-_md5_=d64e15fcfb2a63b5830e7b33962f09c4
diff --git a/metadata/md5-cache/app-text/App-XML-DocBook-Builder-0.100.300-r1 b/metadata/md5-cache/app-text/App-XML-DocBook-Builder-0.100.300-r1
index 3e4ad302c1ef..79f126720561 100644
--- a/metadata/md5-cache/app-text/App-XML-DocBook-Builder-0.100.300-r1
+++ b/metadata/md5-cache/app-text/App-XML-DocBook-Builder-0.100.300-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.shlomifish.org/open-source/projects/docmake/
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~m68k ~mips ppc64 ~riscv ~sparc x86
 LICENSE=MIT
 RDEPEND=dev-perl/Class-XSAccessor virtual/perl-Getopt-Long virtual/perl-File-Path dev-perl/Path-Tiny dev-perl/Test-Trap dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/App-XML-DocBook-Builder-0.1003.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=ccb4112f23a6f33518055283a716b988
+_md5_=7734bf9b40edc8b630d32916d65c9a3d
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index ed99defcff20..cd5f85f7d096 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/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 738787ffca41..4577f2cd728a 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/sqlite-3.38.5 b/metadata/md5-cache/dev-db/sqlite-3.38.5
new file mode 100644
index 000000000000..9e1cd14a7d51
--- /dev/null
+++ b/metadata/md5-cache/dev-db/sqlite-3.38.5
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip >=dev-lang/tcl-8.6:0 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0= ) test? ( >=dev-lang/tcl-8.6:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=SQL database engine
+EAPI=7
+HOMEPAGE=https://sqlite.org/
+INHERIT=autotools flag-o-matic multilib-minimal toolchain-funcs
+IUSE=debug doc icu +readline secure-delete static-libs tcl test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=public-domain
+RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0= )
+RESTRICT=!test? ( test )
+SLOT=3
+SRC_URI=https://sqlite.org/2022/sqlite-src-3380500.zip doc? ( https://sqlite.org/2022/sqlite-doc-3380500.zip )
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=79a3003ea5ffc99ac0510bf5926a21a3
diff --git a/metadata/md5-cache/dev-dotnet/Manifest.gz b/metadata/md5-cache/dev-dotnet/Manifest.gz
index 346983f8e25a..fa3560b507cd 100644
Binary files a/metadata/md5-cache/dev-dotnet/Manifest.gz and b/metadata/md5-cache/dev-dotnet/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-3.1.416 b/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-3.1.416
deleted file mode 100644
index 5095fa24fdd9..000000000000
--- a/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-3.1.416
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=.NET is a free, cross-platform, open-source developer platform
-EAPI=7
-HOMEPAGE=https://dotnet.microsoft.com/
-IUSE=+dotnet-symlink
-KEYWORDS=~amd64 ~arm ~arm64
-LICENSE=MIT
-RDEPEND=app-crypt/mit-krb5:0/0 dev-util/lttng-ust:0 sys-libs/zlib:0/1 dotnet-symlink? ( !dev-dotnet/dotnet-sdk[dotnet-symlink(+)] )
-REQUIRED_USE=elibc_glibc
-RESTRICT=splitdebug
-SLOT=3.1
-SRC_URI=amd64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/3.1.416/dotnet-sdk-3.1.416-linux-x64.tar.gz ) arm? ( https://dotnetcli.azureedge.net/dotnet/Sdk/3.1.416/dotnet-sdk-3.1.416-linux-arm.tar.gz ) arm64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/3.1.416/dotnet-sdk-3.1.416-linux-arm64.tar.gz )
-_md5_=58ec8ed3c9e1e4cb8f526145331c04be
diff --git a/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-3.1.417 b/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-3.1.418-r1
similarity index 69%
rename from metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-3.1.417
rename to metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-3.1.418-r1
index b8e73783faf8..862558ccd21b 100644
--- a/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-3.1.417
+++ b/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-3.1.418-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install
 DESCRIPTION=.NET is a free, cross-platform, open-source developer platform
-EAPI=7
+EAPI=8
 HOMEPAGE=https://dotnet.microsoft.com/
 IUSE=+dotnet-symlink
 KEYWORDS=~amd64 ~arm ~arm64
@@ -9,5 +9,5 @@ RDEPEND=app-crypt/mit-krb5:0/0 dev-util/lttng-ust:0 sys-libs/zlib:0/1 dotnet-sym
 REQUIRED_USE=elibc_glibc
 RESTRICT=splitdebug
 SLOT=3.1
-SRC_URI=amd64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/3.1.417/dotnet-sdk-3.1.417-linux-x64.tar.gz ) arm? ( https://dotnetcli.azureedge.net/dotnet/Sdk/3.1.417/dotnet-sdk-3.1.417-linux-arm.tar.gz ) arm64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/3.1.417/dotnet-sdk-3.1.417-linux-arm64.tar.gz )
-_md5_=58ec8ed3c9e1e4cb8f526145331c04be
+SRC_URI=amd64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/3.1.418/dotnet-sdk-3.1.418-linux-x64.tar.gz ) arm? ( https://dotnetcli.azureedge.net/dotnet/Sdk/3.1.418/dotnet-sdk-3.1.418-linux-arm.tar.gz ) arm64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/3.1.418/dotnet-sdk-3.1.418-linux-arm64.tar.gz )
+_md5_=653833d862309e2de16aeb8bcaf8e49c
diff --git a/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-5.0.405 b/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-5.0.405
deleted file mode 100644
index 7dabbdfd3703..000000000000
--- a/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-5.0.405
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=.NET is a free, cross-platform, open-source developer platform
-EAPI=7
-HOMEPAGE=https://dotnet.microsoft.com/
-IUSE=+dotnet-symlink
-KEYWORDS=~amd64 ~arm ~arm64
-LICENSE=MIT
-RDEPEND=app-crypt/mit-krb5:0/0 dev-util/lttng-ust:0 sys-libs/zlib:0/1 dotnet-symlink? ( !dev-dotnet/dotnet-sdk[dotnet-symlink(+)] !dev-dotnet/dotnet-sdk-bin:3.1[dotnet-symlink(+)] )
-REQUIRED_USE=elibc_glibc
-RESTRICT=splitdebug
-SLOT=5.0
-SRC_URI=amd64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/5.0.405/dotnet-sdk-5.0.405-linux-x64.tar.gz ) arm? ( https://dotnetcli.azureedge.net/dotnet/Sdk/5.0.405/dotnet-sdk-5.0.405-linux-arm.tar.gz ) arm64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/5.0.405/dotnet-sdk-5.0.405-linux-arm64.tar.gz )
-_md5_=47a2c8cc85a6e9c3f99abb3573b698f1
diff --git a/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-5.0.406 b/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-5.0.406
deleted file mode 100644
index 85b668940b0b..000000000000
--- a/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-5.0.406
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=.NET is a free, cross-platform, open-source developer platform
-EAPI=7
-HOMEPAGE=https://dotnet.microsoft.com/
-IUSE=+dotnet-symlink
-KEYWORDS=~amd64 ~arm ~arm64
-LICENSE=MIT
-RDEPEND=app-crypt/mit-krb5:0/0 dev-util/lttng-ust:0 sys-libs/zlib:0/1 dotnet-symlink? ( !dev-dotnet/dotnet-sdk[dotnet-symlink(+)] !dev-dotnet/dotnet-sdk-bin:3.1[dotnet-symlink(+)] )
-REQUIRED_USE=elibc_glibc
-RESTRICT=splitdebug
-SLOT=5.0
-SRC_URI=amd64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/5.0.406/dotnet-sdk-5.0.406-linux-x64.tar.gz ) arm? ( https://dotnetcli.azureedge.net/dotnet/Sdk/5.0.406/dotnet-sdk-5.0.406-linux-arm.tar.gz ) arm64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/5.0.406/dotnet-sdk-5.0.406-linux-arm64.tar.gz )
-_md5_=47a2c8cc85a6e9c3f99abb3573b698f1
diff --git a/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-5.0.301 b/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-5.0.407-r1
similarity index 71%
rename from metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-5.0.301
rename to metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-5.0.407-r1
index 95c13bf063dd..ca59f61636c5 100644
--- a/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-5.0.301
+++ b/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-5.0.407-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install
 DESCRIPTION=.NET is a free, cross-platform, open-source developer platform
-EAPI=7
+EAPI=8
 HOMEPAGE=https://dotnet.microsoft.com/
 IUSE=+dotnet-symlink
 KEYWORDS=~amd64 ~arm ~arm64
@@ -9,5 +9,5 @@ RDEPEND=app-crypt/mit-krb5:0/0 dev-util/lttng-ust:0 sys-libs/zlib:0/1 dotnet-sym
 REQUIRED_USE=elibc_glibc
 RESTRICT=splitdebug
 SLOT=5.0
-SRC_URI=amd64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/5.0.301/dotnet-sdk-5.0.301-linux-x64.tar.gz ) arm? ( https://dotnetcli.azureedge.net/dotnet/Sdk/5.0.301/dotnet-sdk-5.0.301-linux-arm.tar.gz ) arm64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/5.0.301/dotnet-sdk-5.0.301-linux-arm64.tar.gz )
-_md5_=47a2c8cc85a6e9c3f99abb3573b698f1
+SRC_URI=amd64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/5.0.407/dotnet-sdk-5.0.407-linux-x64.tar.gz ) arm? ( https://dotnetcli.azureedge.net/dotnet/Sdk/5.0.407/dotnet-sdk-5.0.407-linux-arm.tar.gz ) arm64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/5.0.407/dotnet-sdk-5.0.407-linux-arm64.tar.gz )
+_md5_=13e09c9a838bb0335521a7d341e4f0b4
diff --git a/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-6.0.101 b/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-6.0.101
deleted file mode 100644
index fbbc0a4f4935..000000000000
--- a/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-6.0.101
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=.NET is a free, cross-platform, open-source developer platform
-EAPI=7
-HOMEPAGE=https://dotnet.microsoft.com/
-IUSE=+dotnet-symlink
-KEYWORDS=~amd64 ~arm ~arm64
-LICENSE=MIT
-RDEPEND=app-crypt/mit-krb5:0/0 dev-util/lttng-ust:0 sys-libs/zlib:0/1 dotnet-symlink? ( !dev-dotnet/dotnet-sdk[dotnet-symlink(+)] !dev-dotnet/dotnet-sdk-bin:3.1[dotnet-symlink(+)] !dev-dotnet/dotnet-sdk-bin:5.0[dotnet-symlink(+)] )
-REQUIRED_USE=elibc_glibc
-RESTRICT=splitdebug
-SLOT=6.0
-SRC_URI=amd64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.101/dotnet-sdk-6.0.101-linux-x64.tar.gz ) arm? ( https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.101/dotnet-sdk-6.0.101-linux-arm.tar.gz ) arm64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.101/dotnet-sdk-6.0.101-linux-arm64.tar.gz )
-_md5_=9169dad28ed4146c023759049ef1aa45
diff --git a/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-6.0.102 b/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-6.0.102
deleted file mode 100644
index cc9018ed384e..000000000000
--- a/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-6.0.102
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=.NET is a free, cross-platform, open-source developer platform
-EAPI=7
-HOMEPAGE=https://dotnet.microsoft.com/
-IUSE=+dotnet-symlink
-KEYWORDS=~amd64 ~arm ~arm64
-LICENSE=MIT
-RDEPEND=app-crypt/mit-krb5:0/0 dev-util/lttng-ust:0 sys-libs/zlib:0/1 dotnet-symlink? ( !dev-dotnet/dotnet-sdk[dotnet-symlink(+)] !dev-dotnet/dotnet-sdk-bin:3.1[dotnet-symlink(+)] !dev-dotnet/dotnet-sdk-bin:5.0[dotnet-symlink(+)] )
-REQUIRED_USE=elibc_glibc
-RESTRICT=splitdebug
-SLOT=6.0
-SRC_URI=amd64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.102/dotnet-sdk-6.0.102-linux-x64.tar.gz ) arm? ( https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.102/dotnet-sdk-6.0.102-linux-arm.tar.gz ) arm64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.102/dotnet-sdk-6.0.102-linux-arm64.tar.gz )
-_md5_=9169dad28ed4146c023759049ef1aa45
diff --git a/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-6.0.201 b/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-6.0.201
deleted file mode 100644
index ae5fd7806014..000000000000
--- a/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-6.0.201
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=.NET is a free, cross-platform, open-source developer platform
-EAPI=7
-HOMEPAGE=https://dotnet.microsoft.com/
-IUSE=+dotnet-symlink
-KEYWORDS=~amd64 ~arm ~arm64
-LICENSE=MIT
-RDEPEND=app-crypt/mit-krb5:0/0 dev-util/lttng-ust:0 sys-libs/zlib:0/1 dotnet-symlink? ( !dev-dotnet/dotnet-sdk[dotnet-symlink(+)] !dev-dotnet/dotnet-sdk-bin:3.1[dotnet-symlink(+)] !dev-dotnet/dotnet-sdk-bin:5.0[dotnet-symlink(+)] )
-REQUIRED_USE=elibc_glibc
-RESTRICT=splitdebug
-SLOT=6.0
-SRC_URI=amd64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.201/dotnet-sdk-6.0.201-linux-x64.tar.gz ) arm? ( https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.201/dotnet-sdk-6.0.201-linux-arm.tar.gz ) arm64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.201/dotnet-sdk-6.0.201-linux-arm64.tar.gz )
-_md5_=9169dad28ed4146c023759049ef1aa45
diff --git a/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-6.0.100 b/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-6.0.202-r1
similarity index 73%
rename from metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-6.0.100
rename to metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-6.0.202-r1
index addbb2f916c4..eaadad2b0de6 100644
--- a/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-6.0.100
+++ b/metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-6.0.202-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install
 DESCRIPTION=.NET is a free, cross-platform, open-source developer platform
-EAPI=7
+EAPI=8
 HOMEPAGE=https://dotnet.microsoft.com/
 IUSE=+dotnet-symlink
 KEYWORDS=~amd64 ~arm ~arm64
@@ -9,5 +9,5 @@ RDEPEND=app-crypt/mit-krb5:0/0 dev-util/lttng-ust:0 sys-libs/zlib:0/1 dotnet-sym
 REQUIRED_USE=elibc_glibc
 RESTRICT=splitdebug
 SLOT=6.0
-SRC_URI=amd64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.100/dotnet-sdk-6.0.100-linux-x64.tar.gz ) arm? ( https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.100/dotnet-sdk-6.0.100-linux-arm.tar.gz ) arm64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.100/dotnet-sdk-6.0.100-linux-arm64.tar.gz )
-_md5_=9169dad28ed4146c023759049ef1aa45
+SRC_URI=amd64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.202/dotnet-sdk-6.0.202-linux-x64.tar.gz ) arm? ( https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.202/dotnet-sdk-6.0.202-linux-arm.tar.gz ) arm64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.202/dotnet-sdk-6.0.202-linux-arm64.tar.gz )
+_md5_=9d1709057e24158754c8ef0b18ea672e
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 0013418f22d1..33654d565b76 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/nim-1.6.6 b/metadata/md5-cache/dev-lang/nim-1.6.6
new file mode 100644
index 000000000000..1685a210371b
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/nim-1.6.6
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=readline? ( sys-libs/readline:0= )
+DESCRIPTION=compiled, garbage-collected systems programming language
+EAPI=8
+HOMEPAGE=https://nim-lang.org/
+INHERIT=bash-completion-r1 multiprocessing toolchain-funcs
+IUSE=debug +readline
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=readline? ( sys-libs/readline:0= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://nim-lang.org/download/nim-1.6.6.tar.xz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=77f81760060fbc09cb4d793572ac5103
diff --git a/metadata/md5-cache/dev-lang/python-2.7.18_p15 b/metadata/md5-cache/dev-lang/python-2.7.18_p15
index 25ab2ee69c02..c6b3f8234285 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.18_p15
+++ b/metadata/md5-cache/dev-lang/python-2.7.18_p15
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.python.org/
 INHERIT=autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs verify-sig
 IUSE=berkdb bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl tk wininst +xml verify-sig
-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=PSF-2
 RDEPEND=app-arch/bzip2:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( dev-libs/openssl:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types ) !<=dev-lang/python-exec-2.4.6-r1
 SLOT=2.7
 SRC_URI=https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-2.7.18_p15.tar.xz verify-sig? ( https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz.asc )
 _eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=0ed99a7c8fa9841c5fa582c456eaaed8
+_md5_=a55c0873d05372237b98c792dcd24b34
diff --git a/metadata/md5-cache/dev-lang/ruby-3.1.2-r1 b/metadata/md5-cache/dev-lang/ruby-3.1.2-r1
index 93fb646efe04..3e1e008d7c47 100644
--- a/metadata/md5-cache/dev-lang/ruby-3.1.2-r1
+++ b/metadata/md5-cache/dev-lang/ruby-3.1.2-r1
@@ -13,4 +13,4 @@ RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs
 SLOT=3.1
 SRC_URI=https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.2.tar.xz
 _eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=b6128cd8013554ff87a1dc74546026b9
+_md5_=b991527f0691d8f13135a00107834981
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 6adc750670be..da5edd611061 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/json-c-0.16-r1 b/metadata/md5-cache/dev-libs/json-c-0.16-r1
index ba17a269ff30..b5a27b427b82 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 ~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	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0e2dda3ea7f71b72091818a30214a251
+_md5_=e4e727e44744793584e3698d9a9a1ba4
diff --git a/metadata/md5-cache/dev-libs/libuv-1.44.1 b/metadata/md5-cache/dev-libs/libuv-1.44.1
index 569101813a67..37df398ec62f 100644
--- a/metadata/md5-cache/dev-libs/libuv-1.44.1
+++ b/metadata/md5-cache/dev-libs/libuv-1.44.1
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Cross-platform asychronous I/O
 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 ~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	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=b128aaebd21da386aae6c0201054b94a
+_md5_=7c8e28e680475fd0ad12cdff5da218fe
diff --git a/metadata/md5-cache/dev-libs/ntl-11.5.1-r1 b/metadata/md5-cache/dev-libs/ntl-11.5.1-r1
index 483a039d0a50..ca8d82470c93 100644
--- a/metadata/md5-cache/dev-libs/ntl-11.5.1-r1
+++ b/metadata/md5-cache/dev-libs/ntl-11.5.1-r1
@@ -4,12 +4,13 @@ DEPEND=dev-libs/gmp:0= dev-libs/gf2x threads? ( >=dev-libs/gf2x-1.2 )
 DESCRIPTION=High-performance and portable C++ number theory library
 EAPI=8
 HOMEPAGE=https://www.shoup.net/ntl/ https://github.com/libntl/ntl
+INHERIT=toolchain-funcs gnuconfig
 IUSE=bindist doc static-libs threads cpu_flags_x86_avx2
-KEYWORDS=~amd64 ~arm64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~arm64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/gmp:0= dev-libs/gf2x threads? ( >=dev-libs/gf2x-1.2 )
 REQUIRED_USE=bindist? ( !cpu_flags_x86_avx2 )
 SLOT=0/44
 SRC_URI=https://www.shoup.net/ntl/ntl-11.5.1.tar.gz
 _eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=267abed7a0eb3e3f49f2eaa6e5fb226e
+_md5_=e1b725df8c92933eb2372930f103b759
diff --git a/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.7.0 b/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.7.0
new file mode 100644
index 000000000000..beb1ea950914
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.7.0
@@ -0,0 +1,15 @@
+BDEPEND=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=Plasma Specific Protocols for Wayland
+EAPI=8
+HOMEPAGE=https://invent.kde.org/libraries/plasma-wayland-protocols
+INHERIT=ecm kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=0
+SRC_URI=mirror://kde/stable/plasma-wayland-protocols/plasma-wayland-protocols-1.7.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=1e49a5e7ef7fa87b410503c15d175c9a
diff --git a/metadata/md5-cache/dev-perl/Class-XSAccessor-1.190.0-r1 b/metadata/md5-cache/dev-perl/Class-XSAccessor-1.190.0-r1
index df818341e86d..2edb2f7ed2b5 100644
--- a/metadata/md5-cache/dev-perl/Class-XSAccessor-1.190.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-XSAccessor-1.190.0-r1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://metacpan.org/release/Class-XSAccessor
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~ppc-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Time-HiRes virtual/perl-XSLoader dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/Class-XSAccessor-1.19.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0
-_md5_=207d148e3ec13a0da073615e7bdd073f
+_md5_=cb31611eb1e8aa526ae8eaf4d2373ad4
diff --git a/metadata/md5-cache/dev-perl/Data-Dump-1.250.0 b/metadata/md5-cache/dev-perl/Data-Dump-1.250.0
index c6ec0dff96a0..223e25944c8b 100644
--- a/metadata/md5-cache/dev-perl/Data-Dump-1.250.0
+++ b/metadata/md5-cache/dev-perl/Data-Dump-1.250.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Data-Dump
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~m68k ~mips 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 ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-MIME-Base64 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GARU/Data-Dump-1.25.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=6eb32fb9d6cf5bb0e23e1412fad8a7e3
+_md5_=91a8441855719f077f8d21ef1f539dc4
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index fc9b3226b707..5b12b75dfc03 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/Test-Trap-0.3.4 b/metadata/md5-cache/dev-perl/Test-Trap-0.3.4
index fe4ff6c1fec2..b4269ad93a2b 100644
--- a/metadata/md5-cache/dev-perl/Test-Trap-0.3.4
+++ b/metadata/md5-cache/dev-perl/Test-Trap-0.3.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Test-Trap
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~m68k ~mips ~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 ~m68k ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Data-Dump virtual/perl-Exporter virtual/perl-File-Temp virtual/perl-IO virtual/perl-Test-Simple virtual/perl-version dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EB/EBHANSSEN/Test-Trap-v0.3.4.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=24cffd05bdc30c97edefe840c3f3fc5a
+_md5_=86aad801376a9cc6296956260919a1d6
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index f9b6b7679c75..d0afd7e88491 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/ephemeral-port-reserve-1.1.4 b/metadata/md5-cache/dev-python/ephemeral-port-reserve-1.1.4
index 5e342cc4f302..3d7f97cac7a5 100644
--- a/metadata/md5-cache/dev-python/ephemeral-port-reserve-1.1.4
+++ b/metadata/md5-cache/dev-python/ephemeral-port-reserve-1.1.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/ephemeral-port-reserve/ https://github.com/Yelp/ephemeral-port-reserve/
 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 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k 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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Yelp/ephemeral-port-reserve/archive/v1.1.4.tar.gz -> ephemeral-port-reserve-1.1.4.gh.tar.gz
 _eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=4d2cd04027bae987f5e1562ef42f6172
+_md5_=6270ec48d0e043ad334abfeb672ecbd6
diff --git a/metadata/md5-cache/dev-python/fonttools-4.30.0 b/metadata/md5-cache/dev-python/fonttools-4.30.0
deleted file mode 100644
index c3ff44a6a3a2..000000000000
--- a/metadata/md5-cache/dev-python/fonttools-4.30.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/fs-2.4.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] app-arch/zopfli ) test? ( >=dev-python/fs-2.4.9[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[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(+)] ) >=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=Library for manipulating TrueType, OpenType, AFM and Type1 fonts
-EAPI=8
-HOMEPAGE=https://github.com/fonttools/fonttools/
-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 ~m68k ppc ppc64 ~riscv sparc x86 ~x64-macos
-LICENSE=BSD
-RDEPEND=>=dev-python/fs-2.4.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[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(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/fonttools/fonttools/archive/4.30.0.tar.gz -> fonttools-4.30.0.tar.gz
-_eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=2af7d16a38ba6fa20023b7574c5261e0
diff --git a/metadata/md5-cache/dev-python/fonttools-4.31.1 b/metadata/md5-cache/dev-python/fonttools-4.31.1
deleted file mode 100644
index 23d7f8a3ae80..000000000000
--- a/metadata/md5-cache/dev-python/fonttools-4.31.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/fs-2.4.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] app-arch/zopfli ) test? ( >=dev-python/fs-2.4.9[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[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(+)] ) >=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=Library for manipulating TrueType, OpenType, AFM and Type1 fonts
-EAPI=8
-HOMEPAGE=https://github.com/fonttools/fonttools/
-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 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
-LICENSE=BSD
-RDEPEND=>=dev-python/fs-2.4.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[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(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/fonttools/fonttools/archive/4.31.1.tar.gz -> fonttools-4.31.1.tar.gz
-_eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=a9e5ad16c1ea95872f3fadb4271015ba
diff --git a/metadata/md5-cache/dev-python/fonttools-4.31.2 b/metadata/md5-cache/dev-python/fonttools-4.31.2
index 22240937612f..115388b9648d 100644
--- a/metadata/md5-cache/dev-python/fonttools-4.31.2
+++ b/metadata/md5-cache/dev-python/fonttools-4.31.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/fonttools/fonttools/
 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 ~m68k ppc ppc64 ~riscv sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=>=dev-python/fs-2.4.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[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(+)] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fonttools/fonttools/archive/4.31.2.tar.gz -> fonttools-4.31.2.tar.gz
 _eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=5bf94e6f12aac9153e91d4a6c6ee6bc3
+_md5_=2af7d16a38ba6fa20023b7574c5261e0
diff --git a/metadata/md5-cache/dev-python/fonttools-4.33.3 b/metadata/md5-cache/dev-python/fonttools-4.33.3
index 1e063b7a5b7d..941e69ff34f6 100644
--- a/metadata/md5-cache/dev-python/fonttools-4.33.3
+++ b/metadata/md5-cache/dev-python/fonttools-4.33.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/fonttools/fonttools/
 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 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=>=dev-python/fs-2.4.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[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(+)] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fonttools/fonttools/archive/4.33.3.tar.gz -> fonttools-4.33.3.tar.gz
 _eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=5b0c0b9d1779dee3a4fe042ea75a4ae6
+_md5_=5023bd41c72184492de76ad64ae89b81
diff --git a/metadata/md5-cache/dev-python/fs-2.4.16 b/metadata/md5-cache/dev-python/fs-2.4.16
index 214d07b68447..19f7eb7d5bd5 100644
--- a/metadata/md5-cache/dev-python/fs-2.4.16
+++ b/metadata/md5-cache/dev-python/fs-2.4.16
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/fs/ https://docs.pyfilesystem.org https://www.willmcgugan.com/tag/fs/
 INHERIT=distutils-r1 optfeature
 IUSE=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 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-python/appdirs-1.4.3[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/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.10[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/f/fs/fs-2.4.16.tar.gz
 _eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=f1ae81ad3ef2ad18057e461cd79e3b22
+_md5_=8e60f4b890936fb564ea8997a8c7589b
diff --git a/metadata/md5-cache/dev-python/gpep517-4 b/metadata/md5-cache/dev-python/gpep517-5
similarity index 96%
rename from metadata/md5-cache/dev-python/gpep517-4
rename to metadata/md5-cache/dev-python/gpep517-5
index 83d067197cab..ad5a80fe18e4 100644
--- a/metadata/md5-cache/dev-python/gpep517-4
+++ b/metadata/md5-cache/dev-python/gpep517-5
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/installer-0.5.0[python_targets_pypy3(-)?,python_targets_pyt
 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/mgorny/gpep517/archive/v4.tar.gz -> gpep517-4.gh.tar.gz
+SRC_URI=https://github.com/mgorny/gpep517/archive/v5.tar.gz -> gpep517-5.gh.tar.gz
 _eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=673bb8d80be792a5960a41a4dee91f39
diff --git a/metadata/md5-cache/dev-python/ini2toml-0.10 b/metadata/md5-cache/dev-python/ini2toml-0.10
index 4c2cfccee405..580916955c3b 100644
--- a/metadata/md5-cache/dev-python/ini2toml-0.10
+++ b/metadata/md5-cache/dev-python/ini2toml-0.10
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/ini2toml/ https://github.com/abravalheri/ini2toml/
 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 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MPL-2.0
 RDEPEND=>=dev-python/packaging-20.7[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-w-0.4.0[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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/abravalheri/ini2toml/archive/v0.10.tar.gz -> ini2toml-0.10.gh.tar.gz
 _eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=4ab9bb2349b7594c1c279c32edb50573
+_md5_=769f4b3373c0a83b2a334fe0fa6366aa
diff --git a/metadata/md5-cache/dev-python/ioflo-2.0.2-r1 b/metadata/md5-cache/dev-python/ioflo-2.0.2-r1
deleted file mode 100644
index e62b4919794c..000000000000
--- a/metadata/md5-cache/dev-python/ioflo-2.0.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-salt-factories[python_targets_python3_8(-)?,python_targets_python3_9(-)?] app-admin/salt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/pytest-7.0.1[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 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Automated Reasoning Engine and Flow Based Programming Framework
-EAPI=7
-HOMEPAGE=https://github.com/ioflo/ioflo/
-INHERIT=distutils-r1
-IUSE=test test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 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 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ioflo/ioflo/archive/v2.0.2.tar.gz -> ioflo-2.0.2.tar.gz
-_eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=7bae4b1038a7b6218bedc872d91da265
diff --git a/metadata/md5-cache/dev-python/ioflo-2.0.2-r2 b/metadata/md5-cache/dev-python/ioflo-2.0.2-r2
index 3bf98b7d48e6..0d3063a97546 100644
--- a/metadata/md5-cache/dev-python/ioflo-2.0.2-r2
+++ b/metadata/md5-cache/dev-python/ioflo-2.0.2-r2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ioflo/ioflo/
 INHERIT=distutils-r1
 IUSE=test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ioflo/ioflo/archive/v2.0.2.tar.gz -> ioflo-2.0.2.tar.gz
 _eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=d109ab8b55e969fd246476c15511e19a
+_md5_=bf97831824f50f8c09131a7d2739400d
diff --git a/metadata/md5-cache/dev-python/ipython-8.2.0 b/metadata/md5-cache/dev-python/ipython-8.2.0
index 78db6a42ba5c..82bf423d578d 100644
--- a/metadata/md5-cache/dev-python/ipython-8.2.0
+++ b/metadata/md5-cache/dev-python/ipython-8.2.0
@@ -5,7 +5,7 @@ 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 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 hppa ~ia64 ~ppc ppc64 ~riscv ~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-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(-)?] matplotlib? ( dev-python/matplotlib[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(+)] )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython/ipython-8.2.0.tar.gz
 _eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=b283c4f6ce76bb2e8b8e506b28aaa1db
+_md5_=62e649dce9e9a63273e399aa482f2dd2
diff --git a/metadata/md5-cache/dev-python/kiwisolver-1.4.1 b/metadata/md5-cache/dev-python/kiwisolver-1.4.1
deleted file mode 100644
index a3eddc389724..000000000000
--- a/metadata/md5-cache/dev-python/kiwisolver-1.4.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/setuptools_scm-3.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/cppy-1.2.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=An efficient C++ implementation of the Cassowary constraint solving algorithm
-EAPI=8
-HOMEPAGE=https://github.com/nucleic/kiwi/
-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=Clear-BSD
-RDEPEND=>=dev-python/cppy-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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/nucleic/kiwi/archive/1.4.1.tar.gz -> kiwi-1.4.1.tar.gz
-_eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=2ead40895899659947cf616e9ee357d3
diff --git a/metadata/md5-cache/dev-python/kiwisolver-1.4.2 b/metadata/md5-cache/dev-python/kiwisolver-1.4.2
index 7d7e8ed96866..c983f7b692cc 100644
--- a/metadata/md5-cache/dev-python/kiwisolver-1.4.2
+++ b/metadata/md5-cache/dev-python/kiwisolver-1.4.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/nucleic/kiwi/
 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Clear-BSD
 RDEPEND=>=dev-python/cppy-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=https://github.com/nucleic/kiwi/archive/1.4.2.tar.gz -> kiwi-1.4.2.tar.gz
 _eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=d8e99b6b07dffa24344870e22d4a94b2
+_md5_=fcff7c8e515dd4775d345002d1a2c783
diff --git a/metadata/md5-cache/dev-python/nspektr-0.3.0 b/metadata/md5-cache/dev-python/nspektr-0.3.0
index 4d09b24a8115..4e00caf8404c 100644
--- a/metadata/md5-cache/dev-python/nspektr-0.3.0
+++ b/metadata/md5-cache/dev-python/nspektr-0.3.0
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://github.com/jaraco/nspektr/ https://pypi.org/project/nspektr/
 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 ~loong ~m68k 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 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=>=dev-python/jaraco-context-4.1.1-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-functools-3.5.0-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.11.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.11.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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=https://github.com/jaraco/nspektr/archive/v0.3.0.tar.gz -> nspektr-0.3.0.tar.gz
 _eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=cf2eec5b15a80ceb1222066039cf3a3f
+_md5_=c06522752e2c376d16c2f58b60c8626c
diff --git a/metadata/md5-cache/dev-python/pylint-2.13.5 b/metadata/md5-cache/dev-python/pylint-2.13.5
index 8a44fa43b3f1..c54d7714d2a9 100644
--- a/metadata/md5-cache/dev-python/pylint-2.13.5
+++ b/metadata/md5-cache/dev-python/pylint-2.13.5
@@ -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 ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k 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.0[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.5.tar.gz -> pylint-2.13.5.gh.tar.gz
 _eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=2f3ad460869e16979c41391b7abe3dac
+_md5_=9969c786cc9742b646752894b5985fd3
diff --git a/metadata/md5-cache/dev-python/pytesseract-0.3.10 b/metadata/md5-cache/dev-python/pytesseract-0.3.10
index 47da6da595e9..61e98660732e 100644
--- a/metadata/md5-cache/dev-python/pytesseract-0.3.10
+++ b/metadata/md5-cache/dev-python/pytesseract-0.3.10
@@ -1,4 +1,4 @@
-BDEPEND=test? ( app-text/tesseract[jpeg,png,tiff,webp] media-libs/leptonica[gif,jpeg2k] app-text/tessdata_fast[l10n_fr] dev-python/pillow ) test? ( app-text/tesseract >=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? ( app-text/tesseract[jpeg,png,tiff,webp] media-libs/leptonica[gif,jpeg2k] app-text/tessdata_fast[l10n_fr] dev-python/pillow[jpeg,zlib] ) test? ( dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] app-text/tesseract >=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=Optical character recognition (OCR) tool
 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
 LICENSE=Apache-2.0
-RDEPEND=app-text/tesseract python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_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(-)?] app-text/tesseract python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_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/madmaze/pytesseract/archive/refs/tags/v0.3.10.tar.gz -> pytesseract-0.3.10.tar.gz
 _eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=72b26df9748e2431e3b54b64051760fa
+_md5_=a341ff81f94bb735665818c42a1cec9f
diff --git a/metadata/md5-cache/dev-python/pytest-salt-factories-1.0.0_rc13 b/metadata/md5-cache/dev-python/pytest-salt-factories-1.0.0_rc13
index 2029117e480a..78a9dd749317 100644
--- a/metadata/md5-cache/dev-python/pytest-salt-factories-1.0.0_rc13
+++ b/metadata/md5-cache/dev-python/pytest-salt-factories-1.0.0_rc13
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/saltstack/pytest-salt-factories
 INHERIT=distutils-r1
 IUSE=test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-tempdir[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/pytest-6.0.0[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(-)?] dev-python/pytest-system-statistics[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-shell-utilities[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(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=app-admin/salt-3001.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=https://github.com/saltstack/pytest-salt-factories/archive/1.0.0rc13.tar.gz -> pytest-salt-factories-1.0.0_rc13.tar.gz
 _eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=8cb18bd5e17a4a1c886c62ffb6aa4132
+_md5_=141edc1423b7d16aad805becf4da46b5
diff --git a/metadata/md5-cache/dev-python/pytest-shell-utilities-1.0.5 b/metadata/md5-cache/dev-python/pytest-shell-utilities-1.0.5
index c4fa7e70f819..90dcf740cd5d 100644
--- a/metadata/md5-cache/dev-python/pytest-shell-utilities-1.0.5
+++ b/metadata/md5-cache/dev-python/pytest-shell-utilities-1.0.5
@@ -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 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/refs/tags/1.0.5.tar.gz -> pytest-shell-utilities-1.0.5.tar.gz
 _eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=5a03eafdf3972a4f9f566c46c55b441d
+_md5_=958a5ecbd053879546521011c64512ba
diff --git a/metadata/md5-cache/dev-python/pytest-skip-markers-1.2.0 b/metadata/md5-cache/dev-python/pytest-skip-markers-1.2.0
index 2bc488f93dc9..aad1a489ab7d 100644
--- a/metadata/md5-cache/dev-python/pytest-skip-markers-1.2.0
+++ b/metadata/md5-cache/dev-python/pytest-skip-markers-1.2.0
@@ -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
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 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/pytest-tempdir[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-system-statistics[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-shell-utilities[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/pyzmq[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[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-skip-markers/archive/refs/tags/1.2.0.tar.gz -> pytest-skip-markers-1.2.0.tar.gz
 _eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=64930e0ba98f419151d71dcf0b4d5a5c
+_md5_=0836873dcb25aba026ea523563ba7dc0
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 b31dc15332e4..4767cbdcb1cf 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 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	0827198943c9287a83534fd8cbe3d897	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=fb652cf35e0ad563476047fccb8419fc
+_md5_=5d6776f85228b2fd78203c4d4cb81dda
diff --git a/metadata/md5-cache/dev-python/pythondialog-3.5.1 b/metadata/md5-cache/dev-python/pythondialog-3.5.1
deleted file mode 100644
index 88416ebff534..000000000000
--- a/metadata/md5-cache/dev-python/pythondialog-3.5.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( || ( ( >=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(-)] ) ) ) 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 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python module for making simple text/console-mode user interfaces
-EAPI=7
-HOMEPAGE=http://pythondialog.sourceforge.net/
-INHERIT=distutils-r1
-IUSE=doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm ~ia64 ppc sparc x86
-LICENSE=LGPL-2
-RDEPEND=dev-util/dialog 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 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://sourceforge/pythondialog/3.5.1/python3-pythondialog-3.5.1.tar.bz2
-_eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=44de1902766a3e3079b26a0e13ebfe99
diff --git a/metadata/md5-cache/dev-python/pythondialog-3.5.3 b/metadata/md5-cache/dev-python/pythondialog-3.5.3
index 1de799b73d1a..c69ad70162cd 100644
--- a/metadata/md5-cache/dev-python/pythondialog-3.5.3
+++ b/metadata/md5-cache/dev-python/pythondialog-3.5.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=http://pythondialog.sourceforge.net/
 INHERIT=distutils-r1
 IUSE=doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ppc sparc x86
 LICENSE=LGPL-2
 RDEPEND=dev-util/dialog 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://sourceforge/pythondialog/3.5.3/python3-pythondialog-3.5.3.tar.bz2
 _eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=cf892bdf37705eaf2ba5abfc7bb837b6
+_md5_=9731691d5e9dfb2b3db914007190b263
diff --git a/metadata/md5-cache/dev-python/raet-0.6.8-r3 b/metadata/md5-cache/dev-python/raet-0.6.8-r3
deleted file mode 100644
index f0eab3a0e1a7..000000000000
--- a/metadata/md5-cache/dev-python/raet-0.6.8-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/six-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/libnacl-1.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ioflo-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/msgpack-1.0.0[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 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Reliable Asynchronous Event Transport Protocol
-EAPI=7
-HOMEPAGE=https://github.com/RaetProtocol/raet
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/six-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/libnacl-1.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ioflo-2.0[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 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/r/raet/raet-0.6.8.tar.gz
-_eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=da4294822bc70e893278eabed09876c4
diff --git a/metadata/md5-cache/dev-python/raet-0.6.8-r4 b/metadata/md5-cache/dev-python/raet-0.6.8-r4
index e2ff14e6dcd5..86eaf37d4c86 100644
--- a/metadata/md5-cache/dev-python/raet-0.6.8-r4
+++ b/metadata/md5-cache/dev-python/raet-0.6.8-r4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/RaetProtocol/raet
 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 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/six-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/libnacl-1.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ioflo-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/r/raet/raet-0.6.8.tar.gz
 _eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=73effa416ee98ad107e6e20e08fb2a55
+_md5_=d0e173c743503906f14fb532ec5930ce
diff --git a/metadata/md5-cache/dev-python/setuptools-60.10.0 b/metadata/md5-cache/dev-python/setuptools-60.10.0
index 0a7087f62872..ce180ddc1c1a 100644
--- a/metadata/md5-cache/dev-python/setuptools-60.10.0
+++ b/metadata/md5-cache/dev-python/setuptools-60.10.0
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://github.com/pypa/setuptools https://pypi.org/project/setuptools/
 INHERIT=distutils-r1 multiprocessing
 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 RDEPEND=>=dev-python/appdirs-1.4.4-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nspektr[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.10.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.10.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.10.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/importlib_resources-5.4.0-r3[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_resources-5.4.0-r3[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[xml(+)] ) 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(+)] )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-60.10.0.tar.gz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.10.0_p1.tar.xz
 _eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=298f539c20e86214f84947c033422b09
+_md5_=c36ca9938b0429e66a1afa53c945f023
diff --git a/metadata/md5-cache/dev-python/setuptools-60.5.0 b/metadata/md5-cache/dev-python/setuptools-60.5.0
deleted file mode 100644
index 578d8a1bab54..000000000000
--- a/metadata/md5-cache/dev-python/setuptools-60.5.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( python_targets_pypy3? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[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-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[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/virtualenv-20[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(-)?] ) python_targets_python3_8? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[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-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[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/virtualenv-20[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(-)?] ) python_targets_python3_9? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[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-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[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/virtualenv-20[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(-)?] ) python_targets_python3_10? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[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-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[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/virtualenv-20[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(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[xml(+)] ) 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(+)] )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of extensions to Distutils
-EAPI=7
-HOMEPAGE=https://github.com/pypa/setuptools https://pypi.org/project/setuptools/
-INHERIT=distutils-r1 multiprocessing
-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
-PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools_scm[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=[xml(+)] ) 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(+)] )
-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/setuptools-60.5.0.tar.gz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.10.0_p1.tar.xz
-_eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=57932aa89627cd8f968c3540f7b08a36
diff --git a/metadata/md5-cache/dev-python/setuptools-60.9.2 b/metadata/md5-cache/dev-python/setuptools-60.9.2
deleted file mode 100644
index da47168cc3d2..000000000000
--- a/metadata/md5-cache/dev-python/setuptools-60.9.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-python/appdirs-1.4.4-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.10.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.10.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.10.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/importlib_resources-5.4.0-r3[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_resources-5.4.0-r3[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) >=dev-python/wheel-0.37.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( python_targets_pypy3? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[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-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[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/virtualenv-20[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(-)?] ) python_targets_python3_8? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[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-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[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/virtualenv-20[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(-)?] ) python_targets_python3_9? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[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-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[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/virtualenv-20[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(-)?] ) python_targets_python3_10? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[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-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[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/virtualenv-20[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(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[xml(+)] ) 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(+)] ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of extensions to Distutils
-EAPI=7
-HOMEPAGE=https://github.com/pypa/setuptools https://pypi.org/project/setuptools/
-INHERIT=distutils-r1 multiprocessing
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv sparc x86
-LICENSE=MIT
-PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-RDEPEND=>=dev-python/appdirs-1.4.4-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.10.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.10.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.10.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/importlib_resources-5.4.0-r3[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_resources-5.4.0-r3[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[xml(+)] ) 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(+)] )
-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/setuptools-60.9.2.tar.gz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.10.0_p1.tar.xz
-_eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=dfcdf96a30eaa6ba37c1c138fcba9b13
diff --git a/metadata/md5-cache/dev-python/setuptools-61.3.0 b/metadata/md5-cache/dev-python/setuptools-61.3.0
deleted file mode 100644
index 68afc4bbb1cc..000000000000
--- a/metadata/md5-cache/dev-python/setuptools-61.3.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-python/appdirs-1.4.4-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nspektr[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.10.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.10.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.10.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_resources-5.4.0-r3[python_targets_python3_8(-)?] ) >=dev-python/wheel-0.37.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( python_targets_pypy3? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[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-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[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/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[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(-)?] ) python_targets_python3_8? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[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-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[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/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[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(-)?] ) python_targets_python3_9? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[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-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[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/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[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(-)?] ) python_targets_python3_10? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[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-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[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/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[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(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[xml(+)] ) 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(+)] ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of extensions to Distutils
-EAPI=7
-HOMEPAGE=https://github.com/pypa/setuptools/ https://pypi.org/project/setuptools/
-INHERIT=distutils-r1 multiprocessing
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-RDEPEND=>=dev-python/appdirs-1.4.4-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nspektr[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.10.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.10.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.10.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_resources-5.4.0-r3[python_targets_python3_8(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[xml(+)] ) 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(+)] )
-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/pypa/setuptools/archive/v61.3.0.tar.gz -> setuptools-61.3.0.gh.tar.gz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.10.0_p1.tar.xz
-_eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=2e356022e2e1ff60a6827147b5fef14d
diff --git a/metadata/md5-cache/dev-python/setuptools-61.3.1-r1 b/metadata/md5-cache/dev-python/setuptools-61.3.1-r1
deleted file mode 100644
index ddba2981ba07..000000000000
--- a/metadata/md5-cache/dev-python/setuptools-61.3.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-python/appdirs-1.4.4-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nspektr[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.10.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.10.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.10.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_resources-5.4.0-r3[python_targets_python3_8(-)?] ) >=dev-python/wheel-0.37.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( python_targets_pypy3? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[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-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[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/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[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(-)?] ) python_targets_python3_8? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[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-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[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/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[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(-)?] ) python_targets_python3_9? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[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-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[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/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[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(-)?] ) python_targets_python3_10? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[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-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[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/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[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(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[xml(+)] ) 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(+)] ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of extensions to Distutils
-EAPI=7
-HOMEPAGE=https://github.com/pypa/setuptools/ https://pypi.org/project/setuptools/
-INHERIT=distutils-r1 multiprocessing
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~m68k ~x86
-LICENSE=MIT
-PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-RDEPEND=>=dev-python/appdirs-1.4.4-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nspektr[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.10.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.10.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.10.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_resources-5.4.0-r3[python_targets_python3_8(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[xml(+)] ) 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(+)] )
-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/setuptools-61.3.1.tar.gz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.10.0_p1.tar.xz
-_eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=c0725e5249628dd4dca88f1bf761650a
diff --git a/metadata/md5-cache/dev-python/setuptools-62.0.0 b/metadata/md5-cache/dev-python/setuptools-62.0.0
deleted file mode 100644
index 45d95d8596d9..000000000000
--- a/metadata/md5-cache/dev-python/setuptools-62.0.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-python/appdirs-1.4.4-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nspektr[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.10.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.10.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.10.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_resources-5.4.0-r3[python_targets_python3_8(-)?] ) >=dev-python/wheel-0.37.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( python_targets_pypy3? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[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-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[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/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[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(-)?] ) python_targets_python3_8? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[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-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[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/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[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(-)?] ) python_targets_python3_9? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[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-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[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/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[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(-)?] ) python_targets_python3_10? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[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-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[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/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[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(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[xml(+)] ) 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(+)] ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of extensions to Distutils
-EAPI=7
-HOMEPAGE=https://github.com/pypa/setuptools/ https://pypi.org/project/setuptools/
-INHERIT=distutils-r1 multiprocessing
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~m68k ~s390 ~x86 ~x64-solaris
-LICENSE=MIT
-PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-RDEPEND=>=dev-python/appdirs-1.4.4-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nspektr[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.10.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.10.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.10.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_resources-5.4.0-r3[python_targets_python3_8(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[xml(+)] ) 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(+)] )
-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/setuptools-62.0.0.tar.gz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.4.tar.xz
-_eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=2ecf65eedfba5354921468e67c4cc4f5
diff --git a/metadata/md5-cache/dev-python/setuptools-62.1.0 b/metadata/md5-cache/dev-python/setuptools-62.1.0
index d1757b6c0f37..abf9c10063dc 100644
--- a/metadata/md5-cache/dev-python/setuptools-62.1.0
+++ b/metadata/md5-cache/dev-python/setuptools-62.1.0
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://github.com/pypa/setuptools/ https://pypi.org/project/setuptools/
 INHERIT=distutils-r1 multiprocessing
 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 ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris
 LICENSE=MIT
 PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 RDEPEND=>=dev-python/appdirs-1.4.4-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nspektr[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.10.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.10.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.10.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_resources-5.4.0-r3[python_targets_python3_8(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[xml(+)] ) 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(+)] )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-62.1.0.tar.gz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.4.tar.xz
 _eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=4acf04daf54a184c5d10cb6344a2f834
+_md5_=72f6bf3fde89d09a2f7e1d66a37ec5e2
diff --git a/metadata/md5-cache/dev-python/setuptools-declarative-requirements-1.2.0-r1 b/metadata/md5-cache/dev-python/setuptools-declarative-requirements-1.2.0-r1
index 0b637c41c160..b331373a9188 100644
--- a/metadata/md5-cache/dev-python/setuptools-declarative-requirements-1.2.0-r1
+++ b/metadata/md5-cache/dev-python/setuptools-declarative-requirements-1.2.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/setuptools-declarative-requirements/ https://github.com/s0undt3ch/setuptools-declarative-requirements
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 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=Apache-2.0
 RDEPEND=dev-python/setuptools[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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/s0undt3ch/setuptools-declarative-requirements/archive/refs/tags/1.2.0.tar.gz -> setuptools-declarative-requirements-1.2.0.tar.gz
 _eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=bc382556ef0e70ecdde987661974d665
+_md5_=8b945283a95f2086b2d53e2890dadf1c
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.35 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.35
index 91e844a5ca1d..fc5549de651e 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.4.35
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.4.35
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/ https://github.com/sqlalchemy/sqlalchemy/
 INHERIT=distutils-r1 optfeature
 IUSE=examples +sqlite test 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[sqlite?] ) 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_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/SQLAlchemy/SQLAlchemy-1.4.35.tar.gz
 _eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=c48fd5a62ef4372bfb5f7d1264105727
+_md5_=f3a030525a44f665876f10f346e99d9f
diff --git a/metadata/md5-cache/dev-python/ujson-5.2.0-r1 b/metadata/md5-cache/dev-python/ujson-5.2.0-r1
index fc4e24b07a07..4a02967110db 100644
--- a/metadata/md5-cache/dev-python/ujson-5.2.0-r1
+++ b/metadata/md5-cache/dev-python/ujson-5.2.0-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/ujson/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-libs/double-conversion:= 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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/ujson/ujson-5.2.0.tar.gz
 _eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=35c14b826e8821e467e8f39514f5c8fa
+_md5_=5c5e3556b0076102e72b9d26cb9245ca
diff --git a/metadata/md5-cache/dev-python/watchdog-1.0.2 b/metadata/md5-cache/dev-python/watchdog-1.0.2
deleted file mode 100644
index d3136ebaae6f..000000000000
--- a/metadata/md5-cache/dev-python/watchdog-1.0.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/argh[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_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/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/pytest-timeout-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
-DESCRIPTION=Python API and shell utilities to monitor file system events
-EAPI=7
-HOMEPAGE=https://github.com/gorakhargosh/watchdog
-INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/argh[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 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/gorakhargosh/watchdog/archive/v1.0.2.tar.gz -> watchdog-1.0.2.tar.gz
-_eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=af288aff885f2b1922dc9de55e1b41bd
diff --git a/metadata/md5-cache/dev-python/watchdog-2.1.6 b/metadata/md5-cache/dev-python/watchdog-2.1.6
deleted file mode 100644
index d0944638f479..000000000000
--- a/metadata/md5-cache/dev-python/watchdog-2.1.6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/pyyaml[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 postinst prepare test
-DEPEND=dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/pytest-timeout-0.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
-DESCRIPTION=Python API and shell utilities to monitor file system events
-EAPI=8
-HOMEPAGE=https://github.com/gorakhargosh/watchdog
-INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/pyyaml[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/gorakhargosh/watchdog/archive/v2.1.6.tar.gz -> watchdog-2.1.6.tar.gz
-_eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=f7452aec895b02600be01925b7389dc1
diff --git a/metadata/md5-cache/dev-python/watchdog-2.1.7 b/metadata/md5-cache/dev-python/watchdog-2.1.7
index 385392f3a4f8..063e88fe7ee0 100644
--- a/metadata/md5-cache/dev-python/watchdog-2.1.7
+++ b/metadata/md5-cache/dev-python/watchdog-2.1.7
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/gorakhargosh/watchdog
 INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/pyyaml[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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gorakhargosh/watchdog/archive/v2.1.7.tar.gz -> watchdog-2.1.7.gh.tar.gz
 _eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=314d254049d90ed03ce226cda82beaeb
+_md5_=ab086ef8a05ae6589123614a3b1f1023
diff --git a/metadata/md5-cache/dev-python/werkzeug-2.1.1 b/metadata/md5-cache/dev-python/werkzeug-2.1.1
index dff8f5126d61..5389a5484336 100644
--- a/metadata/md5-cache/dev-python/werkzeug-2.1.1
+++ b/metadata/md5-cache/dev-python/werkzeug-2.1.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://werkzeug.palletsprojects.com/ https://pypi.org/project/Werkzeug/ https://github.com/pallets/werkzeug/
 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 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=amd64 ~arm arm64 hppa ~ia64 ~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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets/werkzeug/archive/2.1.1.tar.gz -> werkzeug-2.1.1.gh.tar.gz
 _eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=3566d4da6dc900619d367cc1d61a633e
+_md5_=cab831dbd0b59c6c062d652b5d2eb750
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 98f94c0362ce..455d128e0c92 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/airbrussh-1.4.0-r1 b/metadata/md5-cache/dev-ruby/airbrussh-1.4.0-r1
new file mode 100644
index 000000000000..53168c9429a5
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/airbrussh-1.4.0-r1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >dev-ruby/sshkit-1.7.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >dev-ruby/sshkit-1.7.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >dev-ruby/sshkit-1.7.0[ruby_targets_ruby30(-)] ) ) 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_ruby30? ( test? ( dev-ruby/bundler[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=A replacement log formatter for SSHKit
+EAPI=8
+HOMEPAGE=https://github.com/mattbrictson/airbrussh
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( >dev-ruby/sshkit-1.7.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >dev-ruby/sshkit-1.7.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >dev-ruby/sshkit-1.7.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=1
+SRC_URI=https://github.com/mattbrictson/airbrussh/archive/v1.4.0.tar.gz -> airbrussh-1.4.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=62b691181d882814058559b0413fc361
diff --git a/metadata/md5-cache/dev-ruby/backports-3.23.0 b/metadata/md5-cache/dev-ruby/backports-3.23.0
index 01e0771207b3..58de1bbc13b5 100644
--- a/metadata/md5-cache/dev-ruby/backports-3.23.0
+++ b/metadata/md5-cache/dev-ruby/backports-3.23.0
@@ -1,16 +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_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(-)] ) )
+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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+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=Backports of Ruby features for older Ruby
 EAPI=8
 HOMEPAGE=https://github.com/marcandre/backports
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+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 ~s390 ~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_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 )
+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/marcandre/backports/archive/v3.23.0.tar.gz -> backports-3.23.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=6c08c8340efdaeb7f207fa632fab64ee
+_md5_=78d5a74e29e7c3de1f1b2fdb04d0b6c2
diff --git a/metadata/md5-cache/dev-ruby/base32-0.3.4-r1 b/metadata/md5-cache/dev-ruby/base32-0.3.4-r1
index 51eb7de42376..e66e2ab1b91e 100644
--- a/metadata/md5-cache/dev-ruby/base32-0.3.4-r1
+++ b/metadata/md5-cache/dev-ruby/base32-0.3.4-r1
@@ -1,16 +1,17 @@
-BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26(-)] dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest[ruby_targets_ruby30(-)] dev-ruby/rake[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? ( 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(-)] ) )
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26(-)] dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest[ruby_targets_ruby30(-)] dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/minitest[ruby_targets_ruby31(-)] dev-ruby/rake[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? ( 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+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 library which provides base32 decoding and encoding
 EAPI=8
 HOMEPAGE=https://rubygems.org/gems/base32 https://github.com/stesla/base32
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 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_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 )
+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/base32-0.3.4.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=b53d7eb7280f67f74f71fccc9d735418
+_md5_=338f7a9d7e7ac46a8e453f777d5bb879
diff --git a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.17 b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.17
index e97c4556b406..546d8495e553 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.17
+++ b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.17
@@ -1,16 +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_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(-)] ) )
+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? ( 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=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(-)] )
+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=An easy way to keep your users' passwords secure
 EAPI=8
 HOMEPAGE=https://github.com/codahale/bcrypt-ruby
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
+INHERIT=multilib ruby-fakegem
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
 KEYWORDS=~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 )
+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/bcrypt-3.1.17.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=92258831e960e11a8e22c8cb6fc1e16e
+_md5_=34b973367a3b7cbc043055342853fea6
diff --git a/metadata/md5-cache/dev-ruby/c21e-2.0.0 b/metadata/md5-cache/dev-ruby/c21e-2.0.0
index 45f6062ff7b6..1fe216978ce3 100644
--- a/metadata/md5-cache/dev-ruby/c21e-2.0.0
+++ b/metadata/md5-cache/dev-ruby/c21e-2.0.0
@@ -1,16 +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_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(-)] ) )
+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(-)] ) )
 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(-)] )
+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=Run cross-platform executables
 EAPI=8
 HOMEPAGE=https://github.com/cucumber/cucumber/blob/master/c21e/ruby
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+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_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 )
+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://rubygems.org/gems/c21e-2.0.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=0077cde892ca93615f6f62c100cc2d0a
+_md5_=2f266f4d5c04c0726715fee0264883d5
diff --git a/metadata/md5-cache/dev-ruby/capistrano-3.17.0 b/metadata/md5-cache/dev-ruby/capistrano-3.17.0
new file mode 100644
index 000000000000..9f11ed1da484
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/capistrano-3.17.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby26(-)] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby26(-)] >=dev-ruby/rake-10.0.0[ruby_targets_ruby26(-)] dev-ruby/i18n:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby27(-)] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby27(-)] >=dev-ruby/rake-10.0.0[ruby_targets_ruby27(-)] dev-ruby/i18n:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby30(-)] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby30(-)] >=dev-ruby/rake-10.0.0[ruby_targets_ruby30(-)] dev-ruby/i18n:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( 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? ( 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=A distributed application deployment system
+EAPI=7
+HOMEPAGE=https://capistranorb.com/
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby26(-)] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby26(-)] >=dev-ruby/rake-10.0.0[ruby_targets_ruby26(-)] dev-ruby/i18n:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby27(-)] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby27(-)] >=dev-ruby/rake-10.0.0[ruby_targets_ruby27(-)] dev-ruby/i18n:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby30(-)] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby30(-)] >=dev-ruby/rake-10.0.0[ruby_targets_ruby30(-)] dev-ruby/i18n:*[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=3
+SRC_URI=https://rubygems.org/gems/capistrano-3.17.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=5936d553d5281f9af5a07d202dbb1fdd
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.36.0 b/metadata/md5-cache/dev-ruby/capybara-3.36.0
index 54fa7c651248..fe9a3c83f3e6 100644
--- a/metadata/md5-cache/dev-ruby/capybara-3.36.0
+++ b/metadata/md5-cache/dev-ruby/capybara-3.36.0
@@ -4,8 +4,9 @@ DEPEND=test? ( || ( www-client/firefox www-client/firefox-bin ) ) ruby_targets_r
 DESCRIPTION=Capybara aims to simplify the process of integration testing Rack applications
 EAPI=8
 HOMEPAGE=https://github.com/jnicklas/capybara
+INHERIT=virtualx ruby-fakegem
 IUSE=test test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc 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/addressable[ruby_targets_ruby26(-)] dev-ruby/matrix[ruby_targets_ruby26(-)] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby26(-)] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby26(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26(-)] || ( dev-ruby/regexp_parser:2[ruby_targets_ruby26(-)] >=dev-ruby/regexp_parser-1.5:1[ruby_targets_ruby26(-)] ) >=dev-ruby/xpath-3.2:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/addressable[ruby_targets_ruby27(-)] dev-ruby/matrix[ruby_targets_ruby27(-)] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby27(-)] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] || ( dev-ruby/regexp_parser:2[ruby_targets_ruby27(-)] >=dev-ruby/regexp_parser-1.5:1[ruby_targets_ruby27(-)] ) >=dev-ruby/xpath-3.2:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/addressable[ruby_targets_ruby30(-)] dev-ruby/matrix[ruby_targets_ruby30(-)] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby30(-)] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby30(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby30(-)] || ( dev-ruby/regexp_parser:2[ruby_targets_ruby30(-)] >=dev-ruby/regexp_parser-1.5:1[ruby_targets_ruby30(-)] ) >=dev-ruby/xpath-3.2: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 )
@@ -13,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/capybara-3.36.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=fbfe13e31b239f50563dbbe05a8e8d64
+_md5_=8c044ae1aa529ff9337f141783aae5c2
diff --git a/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.7-r1 b/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.7-r1
index 17a85b7e787a..6a2b4cd0ff2c 100644
--- a/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.7-r1
+++ b/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.7-r1
@@ -1,16 +1,17 @@
-BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest[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(-)] ) )
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest[ruby_targets_ruby30(-)] ) ) 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(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/icu:= sys-libs/zlib 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(-)] )
+DEPEND=dev-libs/icu:= sys-libs/zlib 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=Character encoding detecting library for Ruby using ICU
 EAPI=8
 HOMEPAGE=https://github.com/brianmario/charlock_holmes
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=dev-libs/icu:= sys-libs/zlib 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 )
+RDEPEND=dev-libs/icu:= sys-libs/zlib 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/brianmario/charlock_holmes/archive/v0.7.7.tar.gz -> charlock_holmes-0.7.7.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=45dda7f6ff420055023ce423d396da00
+_md5_=2199c18318954dcc7ca521a25a82056e
diff --git a/metadata/md5-cache/dev-ruby/childprocess-3.0.0 b/metadata/md5-cache/dev-ruby/childprocess-3.0.0
deleted file mode 100644
index bc1f89a9ba40..000000000000
--- a/metadata/md5-cache/dev-ruby/childprocess-3.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/ffi-1.0.11[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/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[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=Solution for controlling external programs running in the background
-EAPI=7
-HOMEPAGE=https://github.com/jarib/childprocess
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/ffi-1.0.11[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=2
-SRC_URI=https://rubygems.org/gems/childprocess-3.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=d079a96b9bd825c31cd4ece7afc3d3ea
diff --git a/metadata/md5-cache/dev-ruby/childprocess-4.0.0 b/metadata/md5-cache/dev-ruby/childprocess-4.0.0
deleted file mode 100644
index d4cd5c2b1966..000000000000
--- a/metadata/md5-cache/dev-ruby/childprocess-4.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/ffi-1.0.11[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/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=Solution for controlling external programs running in the background
-EAPI=7
-HOMEPAGE=https://github.com/jarib/childprocess
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/ffi-1.0.11[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=2
-SRC_URI=https://rubygems.org/gems/childprocess-4.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=4b2511c89818a146ce84aa9c27b359ee
diff --git a/metadata/md5-cache/dev-ruby/climate_control-1.0.1 b/metadata/md5-cache/dev-ruby/climate_control-1.0.1
new file mode 100644
index 000000000000..3baf063e6730
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/climate_control-1.0.1
@@ -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? ( 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=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=Easily manage your environment
+EAPI=8
+HOMEPAGE=https://github.com/thoughtbot/climate_control
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 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=0
+SRC_URI=https://rubygems.org/gems/climate_control-1.0.1.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=eeea2ddb73cc9e7262dc8f3344ad7776
diff --git a/metadata/md5-cache/dev-ruby/cmdparse-3.0.7 b/metadata/md5-cache/dev-ruby/cmdparse-3.0.7
deleted file mode 100644
index fc5354dc1860..000000000000
--- a/metadata/md5-cache/dev-ruby/cmdparse-3.0.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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(-)] ) 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=Advanced command line parser supporting commands
-EAPI=7
-HOMEPAGE=https://cmdparse.gettalong.org/
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 test
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=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 )
-SLOT=3
-SRC_URI=https://rubygems.org/gems/cmdparse-3.0.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=665cc636b8945097714b47fe8237ed54
diff --git a/metadata/md5-cache/dev-ruby/color-1.8-r1 b/metadata/md5-cache/dev-ruby/color-1.8-r1
index b6fe9a40fcca..45786d56a540 100644
--- a/metadata/md5-cache/dev-ruby/color-1.8-r1
+++ b/metadata/md5-cache/dev-ruby/color-1.8-r1
@@ -1,16 +1,17 @@
-BDEPEND=ruby_targets_ruby26? ( test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/minitest-5.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? ( 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(-)] ) )
+BDEPEND=ruby_targets_ruby26? ( test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/minitest-5.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? ( 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+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=Colour management with Ruby
 EAPI=8
 HOMEPAGE=https://github.com/halostatue/color
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
 KEYWORDS=amd64 ~ppc ~ppc64 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 )
+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/halostatue/color/archive/v1.8.tar.gz -> color-1.8.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=b4ce3eb6ee37d04cfabd89c83282dc4f
+_md5_=4b9f603efb5b215b2df6a6b267113f32
diff --git a/metadata/md5-cache/dev-ruby/colorator-1.1.0-r1 b/metadata/md5-cache/dev-ruby/colorator-1.1.0-r1
index 4675e565bade..5cfae1792ddd 100644
--- a/metadata/md5-cache/dev-ruby/colorator-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/colorator-1.1.0-r1
@@ -1,16 +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_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(-)] ) )
+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(-)] ) )
 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(-)] )
+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=Colorize your text in the terminal
 EAPI=8
 HOMEPAGE=https://github.com/octopress/colorator
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
 KEYWORDS=~amd64 ~arm64
 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 )
+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/octopress/colorator/archive/v1.1.0.tar.gz -> colorator-1.1.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=154f10be5894d5f91015c3c628e7458e
+_md5_=42264c41990d051fa9a514e0eff6d20b
diff --git a/metadata/md5-cache/dev-ruby/colored-1.2-r1 b/metadata/md5-cache/dev-ruby/colored-1.2-r1
index 285f7f6f343d..c8df8127e004 100644
--- a/metadata/md5-cache/dev-ruby/colored-1.2-r1
+++ b/metadata/md5-cache/dev-ruby/colored-1.2-r1
@@ -1,16 +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_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(-)] ) )
+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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+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=Console coloring
 EAPI=8
 HOMEPAGE=https://github.com/defunkt/colored
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
 KEYWORDS=~amd64 ~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 )
+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/colored-1.2.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=27d4db0ec0bd95d825fa78343ad4f54b
+_md5_=738a0c302ca27b558c3a9b4bb419a256
diff --git a/metadata/md5-cache/dev-ruby/colored2-3.1.2 b/metadata/md5-cache/dev-ruby/colored2-3.1.2
index 9ed00173a89b..cdf5efd7524c 100644
--- a/metadata/md5-cache/dev-ruby/colored2-3.1.2
+++ b/metadata/md5-cache/dev-ruby/colored2-3.1.2
@@ -1,16 +1,17 @@
-BDEPEND=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/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[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=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=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_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=Console coloring
 EAPI=7
 HOMEPAGE=https://github.com/kigster/colored2
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=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? ( 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/colored2-3.1.2.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=ee7ccd2b7b3c1f4935ca038c38732f1f
+_md5_=4175a3eb75b79143c54cbb0e0a207989
diff --git a/metadata/md5-cache/dev-ruby/colorize-0.8.1-r1 b/metadata/md5-cache/dev-ruby/colorize-0.8.1-r1
index 8b7b352e44e5..b78c128a60d0 100644
--- a/metadata/md5-cache/dev-ruby/colorize-0.8.1-r1
+++ b/metadata/md5-cache/dev-ruby/colorize-0.8.1-r1
@@ -1,16 +1,17 @@
-BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest:5[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(-)] ) )
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/minitest:5[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(-)] ) )
 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(-)] )
+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=Adds methods to set color, background color and text effect on console easier
 EAPI=7
 HOMEPAGE=https://github.com/fazibear/colorize
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
 KEYWORDS=~amd64
 LICENSE=GPL-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_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 )
+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/colorize-0.8.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=8c5e85a9f47b75358c0bfb4de5962a7e
+_md5_=e2e4f8dc68b6731ce93ed24c0832b82d
diff --git a/metadata/md5-cache/dev-ruby/columnize-0.9.0-r1 b/metadata/md5-cache/dev-ruby/columnize-0.9.0-r1
index 7be679f4bca8..7a7615abf232 100644
--- a/metadata/md5-cache/dev-ruby/columnize-0.9.0-r1
+++ b/metadata/md5-cache/dev-ruby/columnize-0.9.0-r1
@@ -1,16 +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_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(-)] ) )
+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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+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=Sorts an array in column order
 EAPI=7
 HOMEPAGE=https://github.com/rocky/columnize
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=Ruby
-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 )
+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/columnize-0.9.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=495fabdf70145aaed275dd5e7d6d727a
+_md5_=69ee296083f774d028221dd3624a4dd2
diff --git a/metadata/md5-cache/dev-ruby/commander-4.6.0 b/metadata/md5-cache/dev-ruby/commander-4.6.0
index 9ef510e700a8..3a4f84b8e897 100644
--- a/metadata/md5-cache/dev-ruby/commander-4.6.0
+++ b/metadata/md5-cache/dev-ruby/commander-4.6.0
@@ -1,16 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/highline:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/highline:2[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/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[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? ( dev-ruby/highline:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/highline:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/highline:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/highline:2[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=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_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=The complete solution for Ruby command-line executables
 EAPI=7
 HOMEPAGE=https://visionmedia.github.com/commander/
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-ruby/highline:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/highline: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 )
+RDEPEND=ruby_targets_ruby26? ( dev-ruby/highline:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/highline:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/highline:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/highline:2[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://rubygems.org/gems/commander-4.6.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=3c0b312de2b01b547bd1ee4490dcc347
+_md5_=1bf8a557374f0c2eb858b33599e2311c
diff --git a/metadata/md5-cache/dev-ruby/contracts-0.16.0 b/metadata/md5-cache/dev-ruby/contracts-0.16.0
deleted file mode 100644
index e31feb6fb2fb..000000000000
--- a/metadata/md5-cache/dev-ruby/contracts-0.16.0
+++ /dev/null
@@ -1,15 +0,0 @@
-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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[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(-)] ) )
-DESCRIPTION=provides contracts for Ruby
-EAPI=6
-HOMEPAGE=https://github.com/egonSchiele/contracts.ruby
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=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=0
-SRC_URI=https://rubygems.org/gems/contracts-0.16.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=cef2e60aee1a747a6d74cf22ebbe964b
diff --git a/metadata/md5-cache/dev-ruby/contracts-0.17 b/metadata/md5-cache/dev-ruby/contracts-0.17
index 145285208584..87a877694401 100644
--- a/metadata/md5-cache/dev-ruby/contracts-0.17
+++ b/metadata/md5-cache/dev-ruby/contracts-0.17
@@ -1,16 +1,17 @@
-BDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+BDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( 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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION=provides contracts for Ruby
 EAPI=7
 HOMEPAGE=https://github.com/egonSchiele/contracts.ruby
-IUSE=ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby30 )
+RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0.17
 SRC_URI=https://rubygems.org/gems/contracts-0.17.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=840fde2dd81a71073cd85e75fcae0829
+_md5_=739ab71005dbda4496801df7026da942
diff --git a/metadata/md5-cache/dev-ruby/coolio-1.7.1-r1 b/metadata/md5-cache/dev-ruby/coolio-1.7.1-r1
index ea3b4b138460..e4116c153b8e 100644
--- a/metadata/md5-cache/dev-ruby/coolio-1.7.1-r1
+++ b/metadata/md5-cache/dev-ruby/coolio-1.7.1-r1
@@ -1,16 +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_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(-)] ) )
+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(-)] ) )
 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(-)] )
+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 high performance event framework for Ruby which uses the libev C library
 EAPI=8
 HOMEPAGE=https://coolio.github.io/
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
 KEYWORDS=~amd64 ~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 )
+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/cool.io-1.7.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=a5bc2e5163cd7e1537e51cd444e867da
+_md5_=a8c00efa9c5b2d6f22e2c71b3e5eeace
diff --git a/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r2 b/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r2
index 53ffc62689e2..182eb9dc6526 100644
--- a/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r2
+++ b/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r2
@@ -1,16 +1,17 @@
-BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest[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? ( 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(-)] ) )
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest[ruby_targets_ruby30(-)] ) ) 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? ( 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+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=Synchronization aid to allow threads to wait for operations in other threads
 EAPI=8
 HOMEPAGE=https://github.com/benlangfeld/countdownlatch
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 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_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 )
+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/countdownlatch-1.0.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=53bb8ba298af3437a56746224f5ff94a
+_md5_=c8ce543f58f943c4988f90a26fd04e29
diff --git a/metadata/md5-cache/dev-ruby/creole-0.5.0-r1 b/metadata/md5-cache/dev-ruby/creole-0.5.0-r1
index 17bc0b7608b4..4cee7d885a80 100644
--- a/metadata/md5-cache/dev-ruby/creole-0.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/creole-0.5.0-r1
@@ -1,16 +1,17 @@
-BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/bacon[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bacon[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bacon[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? ( 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(-)] ) )
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/bacon[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bacon[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bacon[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/bacon[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? ( 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+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=Creole-to-HTML converter for Creole, the lightweight markup language
 EAPI=7
 HOMEPAGE=https://github.com/minad/creole
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 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_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 )
+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/minad/creole/archive/v0.5.0.tar.gz -> creole-0.5.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=d27440a28ff07e4bf4825119976946f5
+_md5_=a8bedce6efa810c8f71418a762893dd1
diff --git a/metadata/md5-cache/dev-ruby/curb-1.0.1 b/metadata/md5-cache/dev-ruby/curb-1.0.1
new file mode 100644
index 000000000000..d29ee64c76b3
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/curb-1.0.1
@@ -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=net-misc/curl[ssl] test? ( net-misc/curl ) 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=Ruby-language bindings for libcurl
+EAPI=7
+HOMEPAGE=https://github.com/taf2/curb
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64
+LICENSE=Ruby
+RDEPEND=net-misc/curl[ssl] 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/curb-1.0.1.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=e882c3e86321650c6c4115de03f26699
diff --git a/metadata/md5-cache/dev-ruby/curses-1.4.4 b/metadata/md5-cache/dev-ruby/curses-1.4.4
index 9bee5758c78a..aabd20126142 100644
--- a/metadata/md5-cache/dev-ruby/curses-1.4.4
+++ b/metadata/md5-cache/dev-ruby/curses-1.4.4
@@ -1,16 +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_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(-)] ) )
+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? ( 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=sys-libs/ncurses:0 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(-)] )
+DEPEND=sys-libs/ncurses:0 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=Ruby binding for curses, ncurses, and PDCurses
 EAPI=8
 HOMEPAGE=https://github.com/ruby/curses
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test
 KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=|| ( Ruby BSD-2 )
-RDEPEND=sys-libs/ncurses:0 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 )
+RDEPEND=sys-libs/ncurses:0 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 )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/curses-1.4.4.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=3dd00288330f9f20d37056f18948d919
+_md5_=537df034a926b749f56c9e99e3ef999a
diff --git a/metadata/md5-cache/dev-ruby/matrix-0.4.2 b/metadata/md5-cache/dev-ruby/matrix-0.4.2
index 135a8cc0da92..1c7a954c8120 100644
--- a/metadata/md5-cache/dev-ruby/matrix-0.4.2
+++ b/metadata/md5-cache/dev-ruby/matrix-0.4.2
@@ -4,8 +4,9 @@ DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lan
 DESCRIPTION=An implementation of Matrix and Vector classes
 EAPI=8
 HOMEPAGE=https://github.com/ruby/matrix
+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
+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 )
@@ -13,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/matrix/archive/v0.4.2.tar.gz -> matrix-0.4.2.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=1fbf3d29bbb7caddc2b0d7598ddea149
+_md5_=8adb2e9d322ea4410ba1070a375c336a
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 42acfde4b9e3..71dc21e48d8e 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/edb-debugger-1.3.0 b/metadata/md5-cache/dev-util/edb-debugger-1.3.0
index c86f5b5cee0a..f44e6802b3f3 100644
--- a/metadata/md5-cache/dev-util/edb-debugger-1.3.0
+++ b/metadata/md5-cache/dev-util/edb-debugger-1.3.0
@@ -1,6 +1,6 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost virtual/pkgconfig dev-libs/capstone:= dev-libs/double-conversion dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 graphviz? ( media-gfx/graphviz )
+DEPEND=dev-libs/boost dev-libs/capstone:= dev-libs/double-conversion dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 graphviz? ( media-gfx/graphviz )
 DESCRIPTION=edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg
 EAPI=7
 HOMEPAGE=https://github.com/eteran/edb-debugger
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/capstone:= dev-libs/double-conversion dev-qt/qtconcurrent:5 dev
 SLOT=0
 SRC_URI=https://github.com/eteran/edb-debugger/releases/download/1.3.0/edb-debugger-1.3.0.tgz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ae5f56ec8943d8c56e390a4c0beda5d7
+_md5_=ace8bc26321b7c3fa7066d43bd06d18b
diff --git a/metadata/md5-cache/dev-util/meson-0.61.4-r2 b/metadata/md5-cache/dev-util/meson-0.61.4-r2
index 72f51d372cbe..e273d23e09b0 100644
--- a/metadata/md5-cache/dev-util/meson-0.61.4-r2
+++ b/metadata/md5-cache/dev-util/meson-0.61.4-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://mesonbuild.com/
 INHERIT=bash-completion-r1 distutils-r1 toolchain-funcs
 IUSE=test 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
+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=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_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/m/meson/meson-0.61.4.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	0827198943c9287a83534fd8cbe3d897	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=aed8c191767a0d3d5cb05ac5f94089d1
+_md5_=b8c3d57ab47779902d4749ffef799654
diff --git a/metadata/md5-cache/dev-util/nemiver-0.9.6 b/metadata/md5-cache/dev-util/nemiver-0.9.6
deleted file mode 100644
index 168ffaf49a23..000000000000
--- a/metadata/md5-cache/dev-util/nemiver-0.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.16:2[dbus] >=dev-cpp/glibmm-2.30:2 >=dev-cpp/gtkmm-3:3.0 >=dev-cpp/gtksourceviewmm-3:3.0 >=gnome-base/gsettings-desktop-schemas-0.0.1 >=gnome-base/libgtop-2.19 x11-libs/vte:2.91 >=dev-db/sqlite-3:3 sys-devel/gdb dev-libs/boost memoryview? ( >=app-editors/ghex-2.90:2 ) app-text/docbook-xml-dtd:4.1.2 >=dev-util/intltool-0.40 dev-util/itstool >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A gtkmm front end to the GNU Debugger (gdb)
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Nemiver
-INHERIT=eutils gnome2
-IUSE=debug memoryview
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.16:2[dbus] >=dev-cpp/glibmm-2.30:2 >=dev-cpp/gtkmm-3:3.0 >=dev-cpp/gtksourceviewmm-3:3.0 >=gnome-base/gsettings-desktop-schemas-0.0.1 >=gnome-base/libgtop-2.19 x11-libs/vte:2.91 >=dev-db/sqlite-3:3 sys-devel/gdb dev-libs/boost memoryview? ( >=app-editors/ghex-2.90:2 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/nemiver/0.9/nemiver-0.9.6.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=cdacea6f313a6772418f831e89af7375
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 68aa1c5ca06f..8940b72c26e0 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/repo-2.21 b/metadata/md5-cache/dev-vcs/repo-2.21
index 1a49aa7af2d2..7578c26358c5 100644
--- a/metadata/md5-cache/dev-vcs/repo-2.21
+++ b/metadata/md5-cache/dev-vcs/repo-2.21
@@ -4,11 +4,11 @@ EAPI=7
 HOMEPAGE=https://gerrit.googlesource.com/git-repo
 INHERIT=bash-completion-r1 python-r1
 IUSE=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
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~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 ) !app-admin/radmind !dev-util/repo
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/GerritCodeReview/git-repo/archive/refs/tags/v2.21.tar.gz -> repo-2.21.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=5657d5f585a813ae546ec09507ad2a4d
+_md5_=e5b1b1be0354076d3be3b18711053968
diff --git a/metadata/md5-cache/dev-vcs/stgit-1.4 b/metadata/md5-cache/dev-vcs/stgit-1.4
deleted file mode 100644
index eb1b769827d4..000000000000
--- a/metadata/md5-cache/dev-vcs/stgit-1.4
+++ /dev/null
@@ -1,16 +0,0 @@
-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/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-vcs/git-1.6.3.3 doc? ( app-text/asciidoc app-text/xmlto dev-lang/perl )
-DESCRIPTION=Manage a stack of patches using GIT as a backend
-EAPI=7
-HOMEPAGE=https://stacked-git.github.io
-INHERIT=bash-completion-r1 distutils-r1
-IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/git-1.6.3.3 python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_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/ctmarinas/stgit/archive/v1.4.tar.gz -> stgit-1.4.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	0827198943c9287a83534fd8cbe3d897	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=c99950e4d28a380ada2ad220071c50ce
diff --git a/metadata/md5-cache/dev-vcs/stgit-1.5 b/metadata/md5-cache/dev-vcs/stgit-1.5
index 4bf1039f9132..3a0e7e800cf2 100644
--- a/metadata/md5-cache/dev-vcs/stgit-1.5
+++ b/metadata/md5-cache/dev-vcs/stgit-1.5
@@ -11,6 +11,6 @@ LICENSE=GPL-2
 RDEPEND=>=dev-vcs/git-1.6.3.3 python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_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/ctmarinas/stgit/archive/v1.5.tar.gz -> stgit-1.5.tar.gz
+SRC_URI=https://github.com/stacked-git/stgit/archive/v1.5.tar.gz -> stgit-1.5.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	0827198943c9287a83534fd8cbe3d897	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=01298bd540a2fe41cf3468f7712a2659
+_md5_=a7fc0d1c8f805c2a561c25025f0c7e25
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index ad15a66f3015..ee7baf2bfcf3 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/fortune-mod-3.12.0 b/metadata/md5-cache/games-misc/fortune-mod-3.12.0
index 616b03de1dea..e34c23964117 100644
--- a/metadata/md5-cache/games-misc/fortune-mod-3.12.0
+++ b/metadata/md5-cache/games-misc/fortune-mod-3.12.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.shlomifish.org/open-source/projects/fortune-mod/ http://www.redellipse.net/code/fortune
 INHERIT=cmake
 IUSE=offensive
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~m68k ~mips ppc64 ~riscv ~sparc x86
 LICENSE=BSD
 RDEPEND=app-text/recode:= !games-misc/fortune-mod-tao
 SLOT=0
 SRC_URI=https://github.com/shlomif/fortune-mod/releases/download/fortune-mod-3.12.0/fortune-mod-3.12.0.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=177cc3a6cb445ddf34ee8860e7011c31
+_md5_=adaa41df11ae4104751ffeeb7c53ed88
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 68e183f6a0fb..c5af1f2b9886 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/gnome-shell-42.1 b/metadata/md5-cache/gnome-base/gnome-shell-42.1
new file mode 100644
index 000000000000..0be3535c71ff
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gnome-shell-42.1
@@ -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.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(+)]
+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 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.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
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ?? ( elogind systemd )
+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	4e69b4b5d15387549776392e83e8c42c	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=0f54b8658cbd796ab2fd281d860ab21f
diff --git a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-41.0 b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-41.0
index 607409306575..f163c2d50c61 100644
--- a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-41.0
+++ b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-41.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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~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/41/gsettings-desktop-schemas-41.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	4e69b4b5d15387549776392e83e8c42c	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2f934890a4b15ce4d72b35bdc5ef1b19
+_md5_=486b08239e00b89842f20639160c0755
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index db705817e339..69e76fc2ba9a 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-ews-3.44.1 b/metadata/md5-cache/gnome-extra/evolution-ews-3.44.1
index 4a4ebceb3d91..ef1621da4fd2 100644
--- a/metadata/md5-cache/gnome-extra/evolution-ews-3.44.1
+++ b/metadata/md5-cache/gnome-extra/evolution-ews-3.44.1
@@ -4,7 +4,7 @@ DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.62:2 >=dev-libs/libical-3.0.5:0=[intros
 DESCRIPTION=Evolution module for connecting to Microsoft Exchange Web Services
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
-INHERIT=cmake gnome2
+INHERIT=cmake gnome2 optfeature
 IUSE=test
 KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=LGPL-2.1
@@ -12,5 +12,5 @@ RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.62:2 >=dev-libs/libical-3.0.5:0=[intro
 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	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=45bf9da7ae2014eaebe6a773f6cd5718
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=0a0878babc442a9ec8ec81d666ac1793
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-42.1 b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-42.1
new file mode 100644
index 000000000000..888fa165243b
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-42.1
@@ -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.1.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	4e69b4b5d15387549776392e83e8c42c	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=2523405f0125c5889002381b349729cd
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index ce94c91db48c..5b0ef648e488 100644
Binary files a/metadata/md5-cache/mail-filter/Manifest.gz and b/metadata/md5-cache/mail-filter/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-filter/pyzor-1.0.0_p20211223 b/metadata/md5-cache/mail-filter/pyzor-1.0.0_p20211223
new file mode 100644
index 000000000000..9d13f1ce12d6
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/pyzor-1.0.0_p20211223
@@ -0,0 +1,17 @@
+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(-)] ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_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=test? ( gdbm? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[gdbm] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[gdbm] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[gdbm] ) ) redis? ( dev-python/redis-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) )
+DESCRIPTION=A distributed, collaborative spam detection and filtering network
+EAPI=8
+HOMEPAGE=https://github.com/SpamExperts/pyzor
+INHERIT=distutils-r1
+IUSE=doc gdbm gevent mysql pyzord redis test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=pyzord? ( gdbm? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[gdbm] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[gdbm] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[gdbm] ) ) gevent? ( dev-python/gevent[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) mysql? ( dev-python/mysqlclient[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) redis? ( dev-python/redis-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=pyzord? ( || ( gdbm redis ) ) test? ( gdbm redis ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/SpamExperts/pyzor/archive/2dbe627c1ec245db206cdc73bf1f9d785f1512d8.tar.gz -> pyzor-1.0.0_p20211223.tar.gz
+_eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=3e3cf4c13a7f09ec517d67c4e1b322c9
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 66448fdf22df..67fe69c985ec 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/liberation-fonts-2.1.3 b/metadata/md5-cache/media-fonts/liberation-fonts-2.1.3
index a3d43ad58296..32c2acd84d70 100644
--- a/metadata/md5-cache/media-fonts/liberation-fonts-2.1.3
+++ b/metadata/md5-cache/media-fonts/liberation-fonts-2.1.3
@@ -5,9 +5,9 @@ EAPI=7
 HOMEPAGE=https://github.com/liberationfonts/liberation-fonts
 INHERIT=font python-any-r1
 IUSE=fontforge X X
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~m68k ppc ppc64 ~riscv x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~m68k ppc ppc64 ~riscv x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/6060974/liberation-fonts-2.1.3.tar.gz ) !fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/6060976/liberation-fonts-ttf-2.1.3.tar.gz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	font	d31f12a0f6e13d56dc3062e76ae58a61	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=e53edf128d142f5d7ebe8e8671b0f83c
+_md5_=8e0f39a46c0a1b6514c25792a8cb1204
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 042ca4afa8d7..d3f4978dd57f 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/chafa-1.10.3 b/metadata/md5-cache/media-gfx/chafa-1.10.3
new file mode 100644
index 000000000000..b4dd968b1130
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/chafa-1.10.3
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/glib:2 media-gfx/imagemagick:0= tools? ( >=media-libs/freetype-2.0.0 )
+DESCRIPTION=versatile and fast Unicode/ASCII/ANSI graphics renderer
+EAPI=8
+HOMEPAGE=https://hpjansson.org/chafa/ https://github.com/hpjansson/chafa
+IUSE=+tools
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=LGPL-3+
+RDEPEND=dev-libs/glib:2 media-gfx/imagemagick:0= tools? ( >=media-libs/freetype-2.0.0 )
+SLOT=0
+SRC_URI=https://hpjansson.org/chafa/releases/chafa-1.10.3.tar.xz
+_md5_=7d7c504ef00404766b69dba8dc9c4d30
diff --git a/metadata/md5-cache/media-gfx/graphite2-1.3.14_p20210810-r1 b/metadata/md5-cache/media-gfx/graphite2-1.3.14_p20210810-r1
index e6b80b04bd01..91bfe20ecc4b 100644
--- a/metadata/md5-cache/media-gfx/graphite2-1.3.14_p20210810-r1
+++ b/metadata/md5-cache/media-gfx/graphite2-1.3.14_p20210810-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://scripts.sil.org/cms/scripts/page.php?site_id=projects&item_id=graphite_home
 INHERIT=perl-module python-any-r1 cmake-multilib
 IUSE=perl 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 ~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=perl? ( dev-lang/perl:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/silnrsi/graphite/archive/80c52493ef42e6fe605a69dcddd2a691cd8a1380.tar.gz -> graphite2-1.3.14_p20210810.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=57c80c86f2d9bb7320fa5128fb2c87a0
+_md5_=6e7b75a3f7807409ee7996fbb1f058e4
diff --git a/metadata/md5-cache/media-gfx/krita-5.0.6-r1 b/metadata/md5-cache/media-gfx/krita-5.0.6-r1
new file mode 100644
index 000000000000..ce02108fe437
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/krita-5.0.6-r1
@@ -0,0 +1,17 @@
+BDEPEND=dev-cpp/eigen:3 dev-lang/perl sys-devel/gettext dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+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 ) dev-libs/boost:= dev-libs/quazip:0= python_single_target_python3_8? ( dev-python/PyQt5[declarative,gui,widgets,python_targets_python3_8(-)] dev-python/sip:=[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[declarative,gui,widgets,python_targets_python3_9(-)] dev-python/sip:=[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/PyQt5[declarative,gui,widgets,python_targets_python3_10(-)] dev-python/sip:=[python_targets_python3_10(-)] ) >=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=[-gles2-only] >=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/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libXi color-management? ( >=media-libs/opencolorio-2.0.0 ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( media-libs/libjpeg-turbo:= ) heif? ( >=media-libs/libheif-1.11:= ) mypaint-brush-engine? ( media-libs/libmypaint:= ) openexr? ( media-libs/openexr:= ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.15.2:5 ) raw? ( media-libs/libraw:= ) webp? ( >=media-libs/libwebp-1.2.0:= ) vc? ( >=dev-libs/vc-1.1.0 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Free digital painting application. Digital Painting, Creative Freedom!
+EAPI=8
+HOMEPAGE=https://apps.kde.org/krita/ https://krita.org/en/
+INHERIT=ecm kde.org python-single-r1
+IUSE=color-management fftw gif +gsl heif +jpeg +mypaint-brush-engine openexr pdf qtmedia +raw vc webp test debug test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~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 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-libs/boost:= dev-libs/quazip:0= python_single_target_python3_8? ( dev-python/PyQt5[declarative,gui,widgets,python_targets_python3_8(-)] dev-python/sip:=[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[declarative,gui,widgets,python_targets_python3_9(-)] dev-python/sip:=[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/PyQt5[declarative,gui,widgets,python_targets_python3_10(-)] dev-python/sip:=[python_targets_python3_10(-)] ) >=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=[-gles2-only] >=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/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libXi color-management? ( >=media-libs/opencolorio-2.0.0 ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( media-libs/libjpeg-turbo:= ) heif? ( >=media-libs/libheif-1.11:= ) mypaint-brush-engine? ( media-libs/libmypaint:= ) openexr? ( media-libs/openexr:= ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.15.2:5 ) raw? ( media-libs/libraw:= ) webp? ( >=media-libs/libwebp-1.2.0:= ) || ( 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 )
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/krita/5.0.6/krita-5.0.6.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=cde7b779426b87c09c7a885b96f6198e
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 2fe895e2d63e..c24cf86dd147 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/fontconfig-2.14.0-r1 b/metadata/md5-cache/media-libs/fontconfig-2.14.0-r1
index b8c1afdc6da0..c6d4e9a125cd 100644
--- a/metadata/md5-cache/media-libs/fontconfig-2.14.0-r1
+++ b/metadata/md5-cache/media-libs/fontconfig-2.14.0-r1
@@ -5,8 +5,9 @@ DESCRIPTION=A library for configuring and customizing font access
 EAPI=8
 HOMEPAGE=https://fontconfig.org/
 IDEPEND=!x86-winnt? ( app-eselect/eselect-fontconfig )
+INHERIT=autotools multilib-minimal readme.gentoo-r1
 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 ~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
 PDEPEND=virtual/ttf-fonts
 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/freetype-2.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(-)?] !elibc_Darwin? ( !elibc_SunOS? ( 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(-)?] ) ) elibc_Darwin? ( sys-libs/native-uuid ) elibc_SunOS? ( sys-libs/libuuid ) 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(-)?]
@@ -14,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://fontconfig.org/release/fontconfig-2.14.0.tar.xz
 _eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=267210af302a354baad7b4532840cb04
+_md5_=6e8837ac7e242545a586de78c6d03470
diff --git a/metadata/md5-cache/media-libs/freetype-2.12.1 b/metadata/md5-cache/media-libs/freetype-2.12.1
index a364c079884d..71fb09fb86f7 100644
--- a/metadata/md5-cache/media-libs/freetype-2.12.1
+++ b/metadata/md5-cache/media-libs/freetype-2.12.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.freetype.org/
 INHERIT=autotools flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
 IUSE=X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs svg utils 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 ~sparc64-solaris ~x64-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 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=|| ( FTL GPL-2+ )
 RDEPEND=>=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(-)?] brotli? ( app-arch/brotli[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(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-1.3.0[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(-)?] ) png? ( >=media-libs/libpng-1.2.51:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( svg? ( >=gnome-base/librsvg-2.46.0[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(-)?] ) )
 SLOT=2
 SRC_URI=mirror://sourceforge/freetype/freetype-2.12.1.tar.xz mirror://nongnu/freetype/freetype-2.12.1.tar.xz utils? ( mirror://sourceforge/freetype/ft2demos-2.12.1.tar.xz mirror://nongnu/freetype/ft2demos-2.12.1.tar.xz ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.12.1.tar.xz mirror://nongnu/freetype/freetype-doc-2.12.1.tar.xz )
 _eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=5b762de1bff35aaec6442c250d2c8148
+_md5_=b01e12134c3ede7d9223e4b1e522d366
diff --git a/metadata/md5-cache/media-libs/harfbuzz-4.2.1 b/metadata/md5-cache/media-libs/harfbuzz-4.2.1
index df3fb33bed41..0eaf72acd7ea 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-4.2.1
+++ b/metadata/md5-cache/media-libs/harfbuzz-4.2.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
 INHERIT=flag-o-matic meson-multilib python-any-r1 xdg-utils
 IUSE=+cairo debug doc experimental +glib +graphite icu +introspection test +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
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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=Old-MIT ISC icu
 RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38: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(-)?] ) graphite? ( >=media-gfx/graphite2-1.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(-)?] ) icu? ( >=dev-libs/icu-51.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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) 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(-)?] )
 REQUIRED_USE=introspection? ( glib )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/4.0.0
 SRC_URI=https://github.com/harfbuzz/harfbuzz/archive/4.2.1.tar.gz -> harfbuzz-4.2.1.tar.gz
 _eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	meson	4e69b4b5d15387549776392e83e8c42c	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6645f9bbc18d7ea8e3b81846f64af489
+_md5_=698f872b16746d5922a718e576a461eb
diff --git a/metadata/md5-cache/media-libs/libid3tag-0.16.2 b/metadata/md5-cache/media-libs/libid3tag-0.16.2
new file mode 100644
index 000000000000..fb10eb1068ce
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libid3tag-0.16.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=The MAD id3tag library, Tenacity fork
+EAPI=8
+HOMEPAGE=https://github.com/tenacityteam/libid3tag
+INHERIT=cmake-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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0/0.16.2
+SRC_URI=https://github.com/tenacityteam/libid3tag/archive/refs/tags/0.16.2.tar.gz -> libid3tag-0.16.2.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=8e2369b8547f4ba21f13fd2a3405332f
diff --git a/metadata/md5-cache/media-libs/libpng-1.6.37-r2 b/metadata/md5-cache/media-libs/libpng-1.6.37-r2
index 5f50e09fd428..082944bf296e 100644
--- a/metadata/md5-cache/media-libs/libpng-1.6.37-r2
+++ b/metadata/md5-cache/media-libs/libpng-1.6.37-r2
@@ -4,11 +4,12 @@ DEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 DESCRIPTION=Portable Network Graphics library
 EAPI=7
 HOMEPAGE=http://www.libpng.org/
+INHERIT=libtool multilib-minimal
 IUSE=apng cpu_flags_arm_neon cpu_flags_x86_sse 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 ~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=libpng2
 RDEPEND=>=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(-)?]
 SLOT=0/16
 SRC_URI=mirror://sourceforge/libpng/libpng-1.6.37.tar.xz apng? ( mirror://sourceforge/apng/libpng-1.6.37-apng.patch.gz )
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=d765c9f6984524fb9e0bbe941872b1d1
+_md5_=233fd6218854d3cbdab88fd1c2f87f1c
diff --git a/metadata/md5-cache/media-libs/mesa-21.3.7 b/metadata/md5-cache/media-libs/mesa-21.3.7
deleted file mode 100644
index 18ebe4419963..000000000000
--- a/metadata/md5-cache/media-libs/mesa-21.3.7
+++ /dev/null
@@ -1,17 +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 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-)] ) ) 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 pretend setup test
-DEPEND=>=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(-)?] gallium? ( 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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.107[video_cards_freedreno?,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(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.107[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.107[video_cards_intel] ) 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_r100? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.107[video_cards_amdgpu] ) gallium? ( 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: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(-)?,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: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(-)?,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: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(-)?,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: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(-)?] ) <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: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(-)?,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: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(-)?,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: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(-)?,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: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(-)?] ) <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(-)?] ) ) ) ) ) ) valgrind? ( dev-util/valgrind ) X? ( 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(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
-DESCRIPTION=OpenGL-like graphic library for Linux
-EAPI=7
-HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
-INHERIT=llvm meson-multilib python-any-r1 linux-info
-IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_crocus video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic cpu_flags_x86_sse2 d3d9 debug +egl +gallium +gbm 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
-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(-)?] gallium? ( 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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.107[video_cards_freedreno?,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(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.107[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.107[video_cards_intel] ) 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_r100? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.107[video_cards_amdgpu] ) gallium? ( 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: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(-)?,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: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(-)?,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: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(-)?,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: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(-)?] ) <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: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(-)?,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: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(-)?,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: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(-)?,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: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(-)?] ) <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_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) osmesa? ( gallium ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_crocus? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_lima? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_panfrost? ( gallium ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_v3d? ( gallium ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium ) xa? ( X ) xvmc? ( X ) zink? ( gallium vulkan )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://archive.mesa3d.org/mesa-21.3.7.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	llvm	6f88d422e49b917bf254b2594f3d903c	meson	4e69b4b5d15387549776392e83e8c42c	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=1741735f10dc6ea54187e89ad4b72922
diff --git a/metadata/md5-cache/media-libs/mesa-21.3.8 b/metadata/md5-cache/media-libs/mesa-21.3.8
index f6181211ae55..0a2a94c3285f 100644
--- a/metadata/md5-cache/media-libs/mesa-21.3.8
+++ b/metadata/md5-cache/media-libs/mesa-21.3.8
@@ -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_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_crocus video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic cpu_flags_x86_sse2 d3d9 debug +egl +gallium +gbm 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(-)?] gallium? ( 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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.107[video_cards_freedreno?,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(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.107[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.107[video_cards_intel] ) 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_r100? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.107[video_cards_amdgpu] ) gallium? ( 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: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(-)?,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: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(-)?,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: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(-)?,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: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(-)?] ) <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: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(-)?,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: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(-)?,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: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(-)?,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: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(-)?] ) <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_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) osmesa? ( gallium ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_crocus? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_lima? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_panfrost? ( gallium ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_v3d? ( gallium ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium ) xa? ( X ) xvmc? ( X ) zink? ( gallium vulkan )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-21.3.8.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	llvm	6f88d422e49b917bf254b2594f3d903c	meson	4e69b4b5d15387549776392e83e8c42c	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=fd4271985bebcb6eaf7930fb3961d1c2
+_md5_=de9beb207859f8ccc0d26eafc4605c1c
diff --git a/metadata/md5-cache/media-libs/mesa-22.0.1 b/metadata/md5-cache/media-libs/mesa-22.0.1
deleted file mode 100644
index 621cbb2bead2..000000000000
--- a/metadata/md5-cache/media-libs/mesa-22.0.1
+++ /dev/null
@@ -1,17 +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 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-)] ) ) 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 pretend setup test
-DEPEND=>=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: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(-)?,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: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(-)?,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: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(-)?,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: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(-)?] ) <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: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(-)?,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: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(-)?,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: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(-)?,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: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(-)?] ) <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(-)?] ) ) ) ) ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.24 ) X? ( 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(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
-DESCRIPTION=OpenGL-like graphic library for Linux
-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
-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: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(-)?,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: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(-)?,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: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(-)?,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: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(-)?] ) <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: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(-)?,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: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(-)?,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: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(-)?,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: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(-)?] ) <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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://archive.mesa3d.org/mesa-22.0.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	llvm	6f88d422e49b917bf254b2594f3d903c	meson	4e69b4b5d15387549776392e83e8c42c	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=e2d4b80251c626ddb0411ce387a77072
diff --git a/metadata/md5-cache/media-libs/mesa-22.0.2 b/metadata/md5-cache/media-libs/mesa-22.0.2
deleted file mode 100644
index ab86fbbacfab..000000000000
--- a/metadata/md5-cache/media-libs/mesa-22.0.2
+++ /dev/null
@@ -1,17 +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 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-)] ) ) 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 pretend setup test
-DEPEND=>=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: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(-)?,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: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(-)?,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: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(-)?,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: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(-)?] ) <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: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(-)?,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: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(-)?,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: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(-)?,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: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(-)?] ) <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(-)?] ) ) ) ) ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.24 ) X? ( 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(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
-DESCRIPTION=OpenGL-like graphic library for Linux
-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
-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: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(-)?,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: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(-)?,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: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(-)?,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: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(-)?] ) <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: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(-)?,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: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(-)?,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: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(-)?,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: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(-)?] ) <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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://archive.mesa3d.org/mesa-22.0.2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	llvm	6f88d422e49b917bf254b2594f3d903c	meson	4e69b4b5d15387549776392e83e8c42c	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=e2d4b80251c626ddb0411ce387a77072
diff --git a/metadata/md5-cache/media-libs/mesa-22.0.0 b/metadata/md5-cache/media-libs/mesa-22.0.3
similarity index 60%
rename from metadata/md5-cache/media-libs/mesa-22.0.0
rename to metadata/md5-cache/media-libs/mesa-22.0.3
index 48d2dcebe929..af551b8ed434 100644
--- a/metadata/md5-cache/media-libs/mesa-22.0.0
+++ b/metadata/md5-cache/media-libs/mesa-22.0.3
@@ -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 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-)] ) ) 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 pretend setup test
-DEPEND=>=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: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(-)?,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: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(-)?,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: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(-)?,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: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(-)?] ) <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: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(-)?,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: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(-)?,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: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(-)?,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: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(-)?] ) <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(-)?] ) ) ) ) ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.24 ) X? ( 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(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
+DEPEND=>=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(-)?] ) ) ) ) ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.24 ) X? ( 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(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
 DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=7
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
@@ -8,10 +8,10 @@ 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
 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: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(-)?,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: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(-)?,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: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(-)?,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: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(-)?] ) <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: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(-)?,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: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(-)?,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: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(-)?,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: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(-)?] ) <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(-)?] ) ) ) ) )
+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 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://archive.mesa3d.org/mesa-22.0.0.tar.xz
+SRC_URI=https://archive.mesa3d.org/mesa-22.0.3.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	llvm	6f88d422e49b917bf254b2594f3d903c	meson	4e69b4b5d15387549776392e83e8c42c	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=e2d4b80251c626ddb0411ce387a77072
+_md5_=524cbdbcb314b69834889a0c1c786e8f
diff --git a/metadata/md5-cache/media-libs/mesa-22.1.0_rc3 b/metadata/md5-cache/media-libs/mesa-22.1.0_rc4
similarity index 99%
rename from metadata/md5-cache/media-libs/mesa-22.1.0_rc3
rename to metadata/md5-cache/media-libs/mesa-22.1.0_rc4
index ea2bacdf3ce8..e8c867468e15 100644
--- a/metadata/md5-cache/media-libs/mesa-22.1.0_rc3
+++ b/metadata/md5-cache/media-libs/mesa-22.1.0_rc4
@@ -12,6 +12,6 @@ RDEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 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 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://archive.mesa3d.org/mesa-22.1.0-rc3.tar.xz
+SRC_URI=https://archive.mesa3d.org/mesa-22.1.0-rc4.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	llvm	6f88d422e49b917bf254b2594f3d903c	meson	4e69b4b5d15387549776392e83e8c42c	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=ba679293e7f9c8915edc9dd668b093e7
diff --git a/metadata/md5-cache/media-libs/opencolorio-2.1.1-r7 b/metadata/md5-cache/media-libs/opencolorio-2.1.1-r7
index c5f45bd2d98a..b55f9ebdd9e9 100644
--- a/metadata/md5-cache/media-libs/opencolorio-2.1.1-r7
+++ b/metadata/md5-cache/media-libs/opencolorio-2.1.1-r7
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/2.1.1
 SRC_URI=https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v2.1.1.tar.gz -> opencolorio-2.1.1.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=abe2228847790e4ae639e9ca5ed65ad8
+_md5_=19d7b0c57b7bf6cb8d8b2b4f9849c75c
diff --git a/metadata/md5-cache/media-libs/openimageio-2.3.15.0 b/metadata/md5-cache/media-libs/openimageio-2.3.15.0
new file mode 100644
index 000000000000..7221e6a8b0a3
--- /dev/null
+++ b/metadata/md5-cache/media-libs/openimageio-2.3.15.0
@@ -0,0 +1,17 @@
+BDEPEND=doc? ( app-doc/doxygen dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) dev-util/ninja >=dev-util/cmake-3.20.5 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-libs/boost-1.62:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.7.0:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:0= sys-libs/zlib:= dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) 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-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
+DESCRIPTION=A library for reading and writing images
+EAPI=7
+HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
+INHERIT=cmake font python-single-r1
+IUSE=dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype cpu_flags_x86_aes 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_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c X python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=>=dev-libs/boost-1.62:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.7.0:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:0= sys-libs/zlib:= dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) 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-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+RESTRICT=!test? ( test ) test
+SLOT=0/2.3.1
+SRC_URI=https://github.com/OpenImageIO/oiio/archive/v2.3.15.0.tar.gz -> openimageio-2.3.15.0.tar.gz test? ( https://github.com/OpenImageIO/oiio-images/archive/b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb.tar.gz -> openimageio-oiio-test-image-b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb.tar.gz https://github.com/AcademySoftwareFoundation/openexr-images/archive/f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz -> openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz )
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	font	d31f12a0f6e13d56dc3062e76ae58a61	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=134f30834adff5528e9733dccc44df37
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 3d6a0b04a4ba..f91aa2d51db2 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.05.05 b/metadata/md5-cache/media-sound/abcmidi-2022.05.05
new file mode 100644
index 000000000000..8ff8cfd8408f
--- /dev/null
+++ b/metadata/md5-cache/media-sound/abcmidi-2022.05.05
@@ -0,0 +1,13 @@
+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.05.05.zip
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=6472bf39705eebc0d5dee53ab12c1973
diff --git a/metadata/md5-cache/media-sound/aeolus-0.10.1 b/metadata/md5-cache/media-sound/aeolus-0.10.1
new file mode 100644
index 000000000000..10232c2b053a
--- /dev/null
+++ b/metadata/md5-cache/media-sound/aeolus-0.10.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm preinst
+DEPEND=dev-libs/libclthreads media-libs/alsa-lib >=media-libs/zita-alsa-pcmi-0.3 sys-libs/readline:0 virtual/jack x11-libs/libclxclient x11-libs/libX11 x11-libs/libXft
+DESCRIPTION=A synthesised pipe organ emulator
+EAPI=8
+HOMEPAGE=http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html
+INHERIT=toolchain-funcs flag-o-matic desktop xdg
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libclthreads media-libs/alsa-lib >=media-libs/zita-alsa-pcmi-0.3 sys-libs/readline:0 virtual/jack x11-libs/libclxclient x11-libs/libX11 x11-libs/libXft media-libs/stops
+SLOT=0
+SRC_URI=http://kokkinizita.linuxaudio.org/linuxaudio/downloads/aeolus-0.10.1.tar.bz2
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=a4e289b5a46acf8bc3bdc56a0f204ba0
diff --git a/metadata/md5-cache/media-sound/frescobaldi-3.2 b/metadata/md5-cache/media-sound/frescobaldi-3.2
new file mode 100644
index 000000000000..0228d2cd972f
--- /dev/null
+++ b/metadata/md5-cache/media-sound/frescobaldi-3.2
@@ -0,0 +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 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-python/PyQt5[gui,network,printsupport,svg,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQtWebEngine[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-ly[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-poppler-qt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] media-sound/lilypond
+DESCRIPTION=A LilyPond sheet music text editor
+EAPI=8
+HOMEPAGE=https://www.frescobaldi.org/
+INHERIT=distutils-r1 xdg
+IUSE=python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-python/PyQt5[gui,network,printsupport,svg,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQtWebEngine[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-ly[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-poppler-qt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] media-sound/lilypond x11-themes/tango-icon-theme python_targets_python3_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 )
+SLOT=0
+SRC_URI=https://github.com/wbsoft/frescobaldi/releases/download/v3.2/frescobaldi-3.2.tar.gz
+_eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=f3f30cd0273b41a38e04280c9a0b6136
diff --git a/metadata/md5-cache/media-sound/schismtracker-20220506 b/metadata/md5-cache/media-sound/schismtracker-20220506
new file mode 100644
index 000000000000..7590347590ad
--- /dev/null
+++ b/metadata/md5-cache/media-sound/schismtracker-20220506
@@ -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 postinst postrm preinst prepare
+DEPEND=media-libs/alsa-lib media-libs/libsdl[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXv virtual/os-headers x11-base/xorg-proto
+DESCRIPTION=Free implementation of Impulse Tracker, a tool used to create high quality music
+EAPI=8
+HOMEPAGE=http://schismtracker.org/
+INHERIT=autotools desktop xdg
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2 public-domain
+RDEPEND=media-libs/alsa-lib media-libs/libsdl[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXv
+SLOT=0
+SRC_URI=https://github.com/schismtracker/schismtracker/archive/20220506.tar.gz -> schismtracker-20220506.tar.gz
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=e002539d2d2616b13f27db9d06690b62
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 911993780b5e..89f2e3ecc5b7 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/zabbix-6.0.2-r1 b/metadata/md5-cache/net-analyzer/zabbix-6.0.2-r1
deleted file mode 100644
index ad82d730e925..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-6.0.2-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig agent2? ( >=dev-lang/go-1.12 app-arch/unzip ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup unpack
-DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=8
-HOMEPAGE=https://www.zabbix.com/
-INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +pcre2 +postgres proxy server snmp sqlite ssh static java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent !pcre2? ( dev-libs/libpcre ) pcre2? ( dev-libs/libpcre2:= ) net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
-RESTRICT=test strip
-SLOT=0/6.0
-SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.2.tar.gz agent2? ( mirror://goproxy//github.com/!burnt!sushi/locker/@v/v0.0.0-20171006230638-a6e239ea1c69.zip -> github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c69.zip mirror://goproxy//github.com/!burnt!sushi/locker/@v/v0.0.0-20171006230638-a6e239ea1c69.mod -> github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c69.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/cakturk/go-netstat/@v/v0.0.0-20200220111822-e5b49efee7a5.zip -> github.com%2Fcakturk%2Fgo-netstat%2F@v%2Fv0.0.0-20200220111822-e5b49efee7a5.zip mirror://goproxy//github.com/cakturk/go-netstat/@v/v0.0.0-20200220111822-e5b49efee7a5.mod -> github.com%2Fcakturk%2Fgo-netstat%2F@v%2Fv0.0.0-20200220111822-e5b49efee7a5.mod mirror://goproxy//github.com/chromedp/cdproto/@v/v0.0.0-20210104223854-2cc87dae3ee3.zip -> github.com%2Fchromedp%2Fcdproto%2F@v%2Fv0.0.0-20210104223854-2cc87dae3ee3.zip mirror://goproxy//github.com/chromedp/cdproto/@v/v0.0.0-20210104223854-2cc87dae3ee3.mod -> github.com%2Fchromedp%2Fcdproto%2F@v%2Fv0.0.0-20210104223854-2cc87dae3ee3.mod mirror://goproxy//github.com/chromedp/chromedp/@v/v0.6.0.zip -> github.com%2Fchromedp%2Fchromedp%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/chromedp/chromedp/@v/v0.6.0.mod -> github.com%2Fchromedp%2Fchromedp%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/chromedp/sysutil/@v/v1.0.0.zip -> github.com%2Fchromedp%2Fsysutil%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/chromedp/sysutil/@v/v1.0.0.mod -> github.com%2Fchromedp%2Fsysutil%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.zip -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.mod -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190719114852-fd7a80b32e1f.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190719114852-fd7a80b32e1f.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dustin/gomemcached/@v/v0.0.0-20160817010731-a2284a01c143.zip -> github.com%2Fdustin%2Fgomemcached%2F@v%2Fv0.0.0-20160817010731-a2284a01c143.zip mirror://goproxy//github.com/dustin/gomemcached/@v/v0.0.0-20160817010731-a2284a01c143.mod -> github.com%2Fdustin%2Fgomemcached%2F@v%2Fv0.0.0-20160817010731-a2284a01c143.mod mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.0.zip -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.0.mod -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.3+incompatible.zip -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.3+incompatible.zip mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.3+incompatible.mod -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.3+incompatible.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.zip -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/goburrow/modbus/@v/v0.1.0.zip -> github.com%2Fgoburrow%2Fmodbus%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/goburrow/modbus/@v/v0.1.0.mod -> github.com%2Fgoburrow%2Fmodbus%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/goburrow/serial/@v/v0.1.0.zip -> github.com%2Fgoburrow%2Fserial%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/goburrow/serial/@v/v0.1.0.mod -> github.com%2Fgoburrow%2Fserial%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobwas/httphead/@v/v0.1.0.zip -> github.com%2Fgobwas%2Fhttphead%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gobwas/httphead/@v/v0.1.0.mod -> github.com%2Fgobwas%2Fhttphead%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobwas/pool/@v/v0.2.1.zip -> github.com%2Fgobwas%2Fpool%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/gobwas/pool/@v/v0.2.1.mod -> github.com%2Fgobwas%2Fpool%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/gobwas/ws/@v/v1.0.4.zip -> github.com%2Fgobwas%2Fws%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/gobwas/ws/@v/v1.0.4.mod -> github.com%2Fgobwas%2Fws%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/godbus/dbus/@v/v4.1.0+incompatible.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv4.1.0+incompatible.zip mirror://goproxy//github.com/godbus/dbus/@v/v4.1.0+incompatible.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv4.1.0+incompatible.mod mirror://goproxy//github.com/godror/godror/@v/v0.20.1.zip -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.20.1.zip mirror://goproxy//github.com/godror/godror/@v/v0.20.1.mod -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.20.1.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.zip -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jackc/chunkreader/@v/v1.0.0.zip -> github.com%2Fjackc%2Fchunkreader%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/chunkreader/@v/v1.0.0.mod -> github.com%2Fjackc%2Fchunkreader%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.0.mod -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.1.zip -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.1.mod -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190420214824-7e0022ef6ba3.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190420214824-7e0022ef6ba3.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190824142844-760dd75542eb.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190824142844-760dd75542eb.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190831204454-2fabfa3c18b7.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190831204454-2fabfa3c18b7.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.4.0.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.0.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.1-0.20200601181101-fa742c524853.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.1-0.20200601181101-fa742c524853.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.6.5-0.20200905181414-0d4f029683fc.zip -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.6.5-0.20200905181414-0d4f029683fc.zip mirror://goproxy//github.com/jackc/pgconn/@v/v1.6.5-0.20200905181414-0d4f029683fc.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.6.5-0.20200905181414-0d4f029683fc.mod mirror://goproxy//github.com/jackc/pgio/@v/v1.0.0.zip -> github.com%2Fjackc%2Fpgio%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/pgio/@v/v1.0.0.mod -> github.com%2Fjackc%2Fpgio%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/pgmock/@v/v0.0.0-20190831213851-13a1b77aafa2.zip -> github.com%2Fjackc%2Fpgmock%2F@v%2Fv0.0.0-20190831213851-13a1b77aafa2.zip mirror://goproxy//github.com/jackc/pgmock/@v/v0.0.0-20190831213851-13a1b77aafa2.mod -> github.com%2Fjackc%2Fpgmock%2F@v%2Fv0.0.0-20190831213851-13a1b77aafa2.mod mirror://goproxy//github.com/jackc/pgpassfile/@v/v1.0.0.zip -> github.com%2Fjackc%2Fpgpassfile%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/pgpassfile/@v/v1.0.0.mod -> github.com%2Fjackc%2Fpgpassfile%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/pgproto3/@v/v1.1.0.zip -> github.com%2Fjackc%2Fpgproto3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/jackc/pgproto3/@v/v1.1.0.mod -> github.com%2Fjackc%2Fpgproto3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-alpha1.0.20190420180111-c116219b62db.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-alpha1.0.20190420180111-c116219b62db.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-alpha1.0.20190609003834-432c2951c711.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-alpha1.0.20190609003834-432c2951c711.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-rc3.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-rc3.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-rc3.0.20190831210041-4c03ce451f29.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-rc3.0.20190831210041-4c03ce451f29.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.1.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.4.zip -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.4.zip mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.4.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200307190119-3430c5407db8.mod -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200307190119-3430c5407db8.mod mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200714003250-2b9c44734f2b.zip -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200714003250-2b9c44734f2b.zip mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200714003250-2b9c44734f2b.mod -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200714003250-2b9c44734f2b.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190421001408-4ed0de4755e0.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190421001408-4ed0de4755e0.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190824184912-ab885b375b90.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190824184912-ab885b375b90.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190828014616-a8802b16cc59.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190828014616-a8802b16cc59.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.2.0.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.3.1-0.20200510190516-8cd94a14c75a.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.3.1-0.20200510190516-8cd94a14c75a.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.3.1-0.20200606141011-f6355165a91c.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.3.1-0.20200606141011-f6355165a91c.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.4.3-0.20200905161353-e7d2b057a716.zip -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.4.3-0.20200905161353-e7d2b057a716.zip mirror://goproxy//github.com/jackc/pgtype/@v/v1.4.3-0.20200905161353-e7d2b057a716.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.4.3-0.20200905161353-e7d2b057a716.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-20190420224344-cc3461e65d96.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-20190420224344-cc3461e65d96.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-20190421002000-1b8f0016e912.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-20190421002000-1b8f0016e912.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-pre1.0.20190824185557-6972a5742186.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-pre1.0.20190824185557-6972a5742186.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.5.0.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.5.0.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.6.1-0.20200510190926-94ba730bb1e9.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.6.1-0.20200510190926-94ba730bb1e9.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.6.1-0.20200606145419-4e5062306904.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.6.1-0.20200606145419-4e5062306904.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.8.2-0.20200910143026-040df1ccef85.zip -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.8.2-0.20200910143026-040df1ccef85.zip mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.8.2-0.20200910143026-040df1ccef85.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.8.2-0.20200910143026-040df1ccef85.mod mirror://goproxy//github.com/jackc/puddle/@v/v0.0.0-20190413234325-e4ced69a3a2b.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv0.0.0-20190413234325-e4ced69a3a2b.mod mirror://goproxy//github.com/jackc/puddle/@v/v0.0.0-20190608224051-11cab39313c9.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv0.0.0-20190608224051-11cab39313c9.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.0.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.1.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.2-0.20200821025810-91d0159cc97a.zip -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.2-0.20200821025810-91d0159cc97a.zip mirror://goproxy//github.com/jackc/puddle/@v/v1.1.2-0.20200821025810-91d0159cc97a.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.2-0.20200821025810-91d0159cc97a.mod mirror://goproxy//github.com/josharian/intern/@v/v1.0.0.zip -> github.com%2Fjosharian%2Fintern%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/josharian/intern/@v/v1.0.0.mod -> github.com%2Fjosharian%2Fintern%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.8.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.0.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.2.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.3.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.3.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.6.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.6.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.6.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.6.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.1.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.5.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.14.8.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.8.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.14.8.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.8.mod mirror://goproxy//github.com/mediocregopher/radix/v3/@v/v3.5.0.zip -> github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.5.0.zip mirror://goproxy//github.com/mediocregopher/radix/v3/@v/v3.5.0.mod -> github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//github.com/memcachier/mc/v3/@v/v3.0.1.zip -> github.com%2Fmemcachier%2Fmc%2Fv3%2F@v%2Fv3.0.1.zip mirror://goproxy//github.com/memcachier/mc/v3/@v/v3.0.1.mod -> github.com%2Fmemcachier%2Fmc%2Fv3%2F@v%2Fv3.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.43.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.43.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.43.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.43.mod mirror://goproxy//github.com/natefinch/npipe/@v/v0.0.0-20160621034901-c1b8fa8bdcce.zip -> github.com%2Fnatefinch%2Fnpipe%2F@v%2Fv0.0.0-20160621034901-c1b8fa8bdcce.zip mirror://goproxy//github.com/natefinch/npipe/@v/v0.0.0-20160621034901-c1b8fa8bdcce.mod -> github.com%2Fnatefinch%2Fnpipe%2F@v%2Fv0.0.0-20160621034901-c1b8fa8bdcce.mod mirror://goproxy//github.com/omeid/go-yarn/@v/v0.0.1.zip -> github.com%2Fomeid%2Fgo-yarn%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/omeid/go-yarn/@v/v0.0.1.mod -> github.com%2Fomeid%2Fgo-yarn%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rs/xid/@v/v1.2.1.mod -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.13.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.15.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.15.0.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20200227202807-02e2044944cc.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20200227202807-02e2044944cc.zip mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20200227202807-02e2044944cc.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20200227202807-02e2044944cc.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/zenazn/goji/@v/v0.9.0.mod -> github.com%2Fzenazn%2Fgoji%2F@v%2Fv0.9.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.9.1.mod -> go.uber.org%2Fzap%2F@v%2Fv1.9.1.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190411191339-88737f569e3a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190411191339-88737f569e3a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190820162420-60c769a6c586.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190911031432-227b76d455e7.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190911031432-227b76d455e7.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200323165209-0ec3e9974c59.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210104204734-6f8348627aad.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210104204734-6f8348627aad.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210303074136-134d130e1a04.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210303074136-134d130e1a04.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210303074136-134d130e1a04.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210303074136-134d130e1a04.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425163242-31fd60d6bfdc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425163242-31fd60d6bfdc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190823170909-c4a336ef6a2f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190823170909-c4a336ef6a2f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029041327-9cc4af7d6b2c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029190741-b9c20aec41a5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190410155217-1f06c39b4373.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190410155217-1f06c39b4373.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190513163551-3ee3066db522.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190513163551-3ee3066db522.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.zip -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.zip mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.mod -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/inconshreveable/log15.v2/@v/v2.0.0-20180818164646-67afb5ed74ec.mod -> gopkg.in%2Finconshreveable%2Flog15.v2%2F@v%2Fv2.0.0-20180818164646-67afb5ed74ec.mod mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20190816093944-a6b53ec6cb22.zip -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20190816093944-a6b53ec6cb22.zip mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20190816093944-a6b53ec6cb22.mod -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20190816093944-a6b53ec6cb22.mod mirror://goproxy//gopkg.in/natefinch/npipe.v2/@v/v2.0.0-20160621034901-c1b8fa8bdcce.zip -> gopkg.in%2Fnatefinch%2Fnpipe.v2%2F@v%2Fv2.0.0-20160621034901-c1b8fa8bdcce.zip mirror://goproxy//gopkg.in/natefinch/npipe.v2/@v/v2.0.0-20160621034901-c1b8fa8bdcce.mod -> gopkg.in%2Fnatefinch%2Fnpipe.v2%2F@v%2Fv2.0.0-20160621034901-c1b8fa8bdcce.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod )
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	user-info	69a1ed744ec33cf2c910ff2bd6084d11	webapp	d872f28d7595b70dd46545199ef35fb0
-_md5_=cac17f4990303f0f125f3183143c2c6d
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 501c0f5c5f1e..9763891ef9ad 100644
Binary files a/metadata/md5-cache/net-dialup/Manifest.gz and b/metadata/md5-cache/net-dialup/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dialup/freeradius-3.0.25-r2 b/metadata/md5-cache/net-dialup/freeradius-3.0.25-r2
index 32f003dd18d4..cdbfd5c6df22 100644
--- a/metadata/md5-cache/net-dialup/freeradius-3.0.25-r2
+++ b/metadata/md5-cache/net-dialup/freeradius-3.0.25-r2
@@ -14,4 +14,4 @@ RESTRICT=test firebird? ( bindist )
 SLOT=0
 SRC_URI=https://github.com/FreeRADIUS/freeradius-server/archive/release_3_0_25.tar.gz -> freeradius-3.0.25.tar.gz
 _eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c1927ea08dd63339a12cf8cab39bdf32
+_md5_=a3d1e35b59f1858e74ca177e4642103a
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 9acb2db46731..00f01aaa4a9d 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/signal-desktop-bin-5.41.0 b/metadata/md5-cache/net-im/signal-desktop-bin-5.42.0
similarity index 94%
rename from metadata/md5-cache/net-im/signal-desktop-bin-5.41.0
rename to metadata/md5-cache/net-im/signal-desktop-bin-5.42.0
index 92e62cc90b84..f58ec0c717ab 100644
--- a/metadata/md5-cache/net-im/signal-desktop-bin-5.41.0
+++ b/metadata/md5-cache/net-im/signal-desktop-bin-5.42.0
@@ -2,12 +2,13 @@ DEFINED_PHASES=install postinst postrm preinst prepare unpack
 DESCRIPTION=Allows you to send and receive messages of Signal Messenger on your computer
 EAPI=8
 HOMEPAGE=https://signal.org/ https://github.com/signalapp/Signal-Desktop
+INHERIT=pax-utils unpacker xdg
 IUSE=+sound
 KEYWORDS=-* amd64
 LICENSE=GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
 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[X(+)] net-print/cups sys-apps/dbus[X] x11-libs/gdk-pixbuf:2 x11-libs/cairo x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango sound? ( || ( media-sound/pulseaudio media-sound/apulse ) )
 RESTRICT=splitdebug
 SLOT=0
-SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_5.41.0_amd64.deb
+SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_5.42.0_amd64.deb
 _eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=f96d7557a20fe2bdf2fb6af689ba7ef3
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 13b066743105..0bc1f3134829 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/gerbera-1.10.0 b/metadata/md5-cache/net-misc/gerbera-1.11.0
similarity index 98%
rename from metadata/md5-cache/net-misc/gerbera-1.10.0
rename to metadata/md5-cache/net-misc/gerbera-1.11.0
index c82ad379f71d..a1e628072214 100644
--- a/metadata/md5-cache/net-misc/gerbera-1.10.0
+++ b/metadata/md5-cache/net-misc/gerbera-1.11.0
@@ -10,6 +10,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=acct-user/gerbera dev-db/sqlite dev-libs/libebml:= dev-libs/libfmt:= dev-libs/pugixml dev-libs/spdlog:= >=net-libs/libupnp-1.14.12:=[ipv6,reuseaddr,-blocking-tcp] sys-apps/util-linux sys-libs/zlib virtual/libiconv curl? ( net-misc/curl ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( media-video/ffmpeg:= ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) javascript? ( dev-lang/duktape:= ) lastfm? ( media-libs/lastfmlib ) magic? ( sys-apps/file ) matroska? ( media-libs/libmatroska:= ) mysql? ( dev-db/mysql-connector-c ) taglib? ( media-libs/taglib )
 SLOT=0
-SRC_URI=https://github.com/gerbera/gerbera/archive/refs/tags/v1.10.0.tar.gz -> gerbera-1.10.0.tar.gz
+SRC_URI=https://github.com/gerbera/gerbera/archive/refs/tags/v1.11.0.tar.gz -> gerbera-1.11.0.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=18694e6533f1193cedfab81864f644e7
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index f71a4a27a4c5..5b6cb762c0b3 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/dante-1.4.1-r6 b/metadata/md5-cache/net-proxy/dante-1.4.1-r6
index 39621a8973d0..9981170d581a 100644
--- a/metadata/md5-cache/net-proxy/dante-1.4.1-r6
+++ b/metadata/md5-cache/net-proxy/dante-1.4.1-r6
@@ -4,6 +4,7 @@ DEPEND=sys-apps/shadow virtual/libcrypt:= kerberos? ( virtual/krb5 ) pam? ( sys-
 DESCRIPTION=A free socks4,5 and msproxy implementation
 EAPI=7
 HOMEPAGE=https://www.inet.no/dante/
+INHERIT=autotools systemd
 IUSE=debug kerberos pam selinux static-libs tcpd upnp
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD GPL-2
@@ -11,4 +12,4 @@ RDEPEND=sys-apps/shadow virtual/libcrypt:= kerberos? ( virtual/krb5 ) pam? ( sys
 SLOT=0
 SRC_URI=https://www.inet.no/dante/files/dante-1.4.1.tar.gz
 _eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=abf2941754aba943a2c4292f2b1763c7
+_md5_=93c4556504fdbb3673853131d4639d53
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index b2ffac129a71..190e5b25c696 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/tor-0.4.6.10 b/metadata/md5-cache/net-vpn/tor-0.4.6.10
index a02fcd4451a6..f6a43e725460 100644
--- a/metadata/md5-cache/net-vpn/tor-0.4.6.10
+++ b/metadata/md5-cache/net-vpn/tor-0.4.6.10
@@ -1,6 +1,6 @@
 BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-tor-20220216 ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=configure install setup unpack
-DEPEND=dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) test? ( dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) || ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) )
+DEPEND=dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) test? ( dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) || ( >=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 ) )
 DESCRIPTION=Anonymizing overlay network for TCP
 EAPI=8
 HOMEPAGE=https://www.torproject.org/
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.torproject.org/dist/tor-0.4.6.10.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.6.10.tar.gz verify-sig? ( https://dist.torproject.org/tor-0.4.6.10.tar.gz.sha256sum https://dist.torproject.org/tor-0.4.6.10.tar.gz.sha256sum.asc )
 _eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=abf3ed1e05c3f1207def4c20627b2c98
+_md5_=922ce96f43215a7e454a9da72b42b8ca
diff --git a/metadata/md5-cache/net-vpn/tor-0.4.7.7 b/metadata/md5-cache/net-vpn/tor-0.4.7.7
index 5e2d985e4069..0959cc1c3e8f 100644
--- a/metadata/md5-cache/net-vpn/tor-0.4.7.7
+++ b/metadata/md5-cache/net-vpn/tor-0.4.7.7
@@ -1,6 +1,6 @@
 BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-tor-20220216 ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=configure install setup unpack
-DEPEND=dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) test? ( dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) || ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) )
+DEPEND=dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) test? ( dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) || ( >=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 ) )
 DESCRIPTION=Anonymizing overlay network for TCP
 EAPI=8
 HOMEPAGE=https://www.torproject.org/
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.torproject.org/dist/tor-0.4.7.7.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.7.7.tar.gz verify-sig? ( https://dist.torproject.org/tor-0.4.7.7.tar.gz.sha256sum https://dist.torproject.org/tor-0.4.7.7.tar.gz.sha256sum.asc )
 _eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=887839c7df66d56371c332e15f84c3ba
+_md5_=a58d42b41f5fda05d8c281d29fe26720
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 13c9d80b7a7f..068a077058fc 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/i2c-tools-4.2 b/metadata/md5-cache/sys-apps/i2c-tools-4.2
index 6c8be075b9db..92d415e8e5fe 100644
--- a/metadata/md5-cache/sys-apps/i2c-tools-4.2
+++ b/metadata/md5-cache/sys-apps/i2c-tools-4.2
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://www.kernel.org/pub/software/utils/i2c-tools
 INHERIT=distutils-r1 flag-o-matic toolchain-funcs
 IUSE=perl python python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=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 ) ) perl? ( dev-lang/perl )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/utils/i2c-tools/i2c-tools-4.2.tar.xz
 _eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=62cda38f8a908999f8130ec659c86000
+_md5_=a39dda7d1ef54d01cf8563deda907bac
diff --git a/metadata/md5-cache/sys-apps/i2c-tools-4.3 b/metadata/md5-cache/sys-apps/i2c-tools-4.3
index 6bf689a33eaf..f0fd3b4a1350 100644
--- a/metadata/md5-cache/sys-apps/i2c-tools-4.3
+++ b/metadata/md5-cache/sys-apps/i2c-tools-4.3
@@ -1,15 +1,15 @@
-BDEPEND=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 ) dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
+BDEPEND=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/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
 DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=I2C tools for bus probing, chip dumping, EEPROM decoding, and more
 EAPI=8
 HOMEPAGE=https://www.kernel.org/pub/software/utils/i2c-tools
 INHERIT=distutils-r1 flag-o-matic toolchain-funcs
-IUSE=python python_targets_python3_8 python_targets_python3_9
+IUSE=python python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=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 ) )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
+RDEPEND=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://www.kernel.org/pub/software/utils/i2c-tools/i2c-tools-4.3.tar.xz
 _eclasses_=distutils-r1	0827198943c9287a83534fd8cbe3d897	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=a0514d2e353951940a58d0df9ee89688
+_md5_=a750fad26d762f6d2816f076c787241c
diff --git a/metadata/md5-cache/sys-apps/systemd-9999 b/metadata/md5-cache/sys-apps/systemd-9999
index 471a948186df..a0326630f68b 100644
--- a/metadata/md5-cache/sys-apps/systemd-9999
+++ b/metadata/md5-cache/sys-apps/systemd-9999
@@ -5,13 +5,13 @@ DESCRIPTION=System and service manager for Linux
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
 INHERIT=git-r3 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 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
+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
 PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-fs/udev-init-scripts-34 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
 PROPERTIES=live
-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 )
+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
+REQUIRED_USE=dns-over-tls? ( || ( gnutls openssl ) ) homed? ( cryptsetup pam openssl ) importd? ( curl lzma || ( gcrypt openssl ) ) pwquality? ( homed )
 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	3cfb791b045bfb6773a6d0f2d80ce9fd	meson	4e69b4b5d15387549776392e83e8c42c	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7cc2ee319ffc4ccd555abe7c8b0b0f44
+_md5_=26becef6c899d0fd85152408027bdbe3
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
new file mode 100644
index 000000000000..8e3fddf84695
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.14.4
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/gdbus-codegen sys-devel/gettext virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=configure
+DEPEND=>=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 )
+DESCRIPTION=Desktop integration portal
+EAPI=8
+HOMEPAGE=https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal
+INHERIT=systemd
+IUSE=geolocation screencast systemd
+KEYWORDS=~amd64 ~arm ~arm64 ~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	4a33c9008e5ee30cb8840a3fdc24df2b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=5a6f092c6635e3fa29d792f4fdbaa0cb
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 490ee72733e0..08525d4c2f7f 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/gcc-11.3.1_pre9999 b/metadata/md5-cache/sys-devel/gcc-11.3.1_pre9999
index 03cdbdbf51e5..83cba0f5179a 100644
--- a/metadata/md5-cache/sys-devel/gcc-11.3.1_pre9999
+++ b/metadata/md5-cache/sys-devel/gcc-11.3.1_pre9999
@@ -4,6 +4,7 @@ DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv n
 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 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
@@ -13,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=https://dev.gentoo.org/~soap/distfiles/gcc-11.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-11.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-11.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-11.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-11.3.0-patches-3.tar.bz2 mirror://gentoo/gcc-11.3.0-patches-3.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	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	c93e499605267ec524b114788ae7fac2	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=94568e8b59b1a624d1831113edd19d6b
+_md5_=fc95742e90592060fd9dc8d3df2e13fb
diff --git a/metadata/md5-cache/sys-devel/gcc-12.0.1_pre20220429 b/metadata/md5-cache/sys-devel/gcc-12.0.1_pre20220429
deleted file mode 100644
index 11072117ab33..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-12.0.1_pre20220429
+++ /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=7
-HOMEPAGE=https://gcc.gnu.org/
-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=~loong
-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.1.0-RC-20220429/gcc-12.1.0-RC-20220429.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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	c93e499605267ec524b114788ae7fac2	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=95ffd11e8a575d6fbee0905641ad09f2
diff --git a/metadata/md5-cache/sys-devel/gcc-12.0.1_pre20220430 b/metadata/md5-cache/sys-devel/gcc-12.1.0
similarity index 62%
rename from metadata/md5-cache/sys-devel/gcc-12.0.1_pre20220430
rename to metadata/md5-cache/sys-devel/gcc-12.1.0
index 73a2e21cd73f..b4327ae59973 100644
--- a/metadata/md5-cache/sys-devel/gcc-12.0.1_pre20220430
+++ b/metadata/md5-cache/sys-devel/gcc-12.1.0
@@ -12,6 +12,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=12
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/12-20220430/gcc-12-20220430.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
+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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	c93e499605267ec524b114788ae7fac2	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c5152cfee0bf36c81c5791ab9cf0e22c
+_md5_=095df47cc59efe54570bbd99a9d9ec49
diff --git a/metadata/md5-cache/sys-devel/gcc-12.0.0_pre9999 b/metadata/md5-cache/sys-devel/gcc-12.1.1_pre9999
similarity index 98%
rename from metadata/md5-cache/sys-devel/gcc-12.0.0_pre9999
rename to metadata/md5-cache/sys-devel/gcc-12.1.1_pre9999
index 0f85f6252e1e..a1c988a48d4b 100644
--- a/metadata/md5-cache/sys-devel/gcc-12.0.0_pre9999
+++ b/metadata/md5-cache/sys-devel/gcc-12.1.1_pre9999
@@ -4,6 +4,7 @@ DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv n
 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 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
@@ -13,4 +14,4 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	c93e499605267ec524b114788ae7fac2	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=283eeb257415e54128ff8e14957d592c
+_md5_=7620e424b14f7e446d36507de5e1b01b
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index dd6c7d580033..06c2f3b0910c 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/xwmfs-0.90 b/metadata/md5-cache/sys-fs/xwmfs-0.91
similarity index 80%
rename from metadata/md5-cache/sys-fs/xwmfs-0.90
rename to metadata/md5-cache/sys-fs/xwmfs-0.91
index 49677c83be63..53d62fd84981 100644
--- a/metadata/md5-cache/sys-fs/xwmfs-0.90
+++ b/metadata/md5-cache/sys-fs/xwmfs-0.91
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=sys-fs/fuse:0= >=x11-libs/libX11-1.6.5
 SLOT=0
-SRC_URI=https://github.com/gerstner-hub/xwmfs/releases/download/v0.90/xwmfs-0.90-dist.tar.gz -> xwmfs-0.90.tar.gz
-_md5_=8ee0aefda2904f2483c34e6034a58359
+SRC_URI=https://github.com/gerstner-hub/xwmfs/releases/download/v0.91/xwmfs-0.91-dist.tar.gz -> xwmfs-0.91.tar.gz
+_md5_=4f1c0ad3b9333fb4ef71bc3e8f7d50c5
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 66ff4000c5fe..abcfd90e4071 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/binutils-libs-2.38-r2 b/metadata/md5-cache/sys-libs/binutils-libs-2.38-r2
index 4e60d6810ff1..1fabf87efb0a 100644
--- a/metadata/md5-cache/sys-libs/binutils-libs-2.38-r2
+++ b/metadata/md5-cache/sys-libs/binutils-libs-2.38-r2
@@ -4,11 +4,12 @@ DEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(
 DESCRIPTION=Core binutils libraries (libbfd, libopcodes, libiberty) for external packages
 EAPI=7
 HOMEPAGE=https://sourceware.org/binutils/
+INHERIT=libtool toolchain-funcs multilib-minimal
 IUSE=64-bit-bfd cet multitarget nls 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/binutils-config-5
 SLOT=0/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_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=493acce14250e3b63ca5013d7b9190ec
+_md5_=11482241869fe421c8327e5d62ed7adb
diff --git a/metadata/md5-cache/sys-libs/libhugetlbfs-2.23 b/metadata/md5-cache/sys-libs/libhugetlbfs-2.23
index a13d21a7fd6a..6a41a6e31bf5 100644
--- a/metadata/md5-cache/sys-libs/libhugetlbfs-2.23
+++ b/metadata/md5-cache/sys-libs/libhugetlbfs-2.23
@@ -1,4 +1,4 @@
-BDEPEND=test? ( || ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) )
+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 ) )
 DEFINED_PHASES=compile install prepare setup test
 DESCRIPTION=Easy hugepage access
 EAPI=7
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libhugetlbfs/libhugetlbfs/archive/2.23.tar.gz -> libhugetlbfs-2.23.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=9bed55c1486494531225c0363cec063d
+_md5_=629cff80d6ba938b06471ec20b6e61ab
diff --git a/metadata/md5-cache/sys-libs/libxcrypt-4.4.28 b/metadata/md5-cache/sys-libs/libxcrypt-4.4.28
index 470b30f4f308..60d818134780 100644
--- a/metadata/md5-cache/sys-libs/libxcrypt-4.4.28
+++ b/metadata/md5-cache/sys-libs/libxcrypt-4.4.28
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-libs/libxcrypt/libxcrypt-4.4.28-autotools.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=bfbfbf0985d58bf4fbe37a8e043a72e2
+_md5_=0a7726606e895257367eb47ff40a8114
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 7462775b46dd..3c0958190008 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/perl-IO-Compress-2.103.0-r1 b/metadata/md5-cache/virtual/perl-IO-Compress-2.103.0-r1
index d2daeb1b846d..afdee9c3f8af 100644
--- a/metadata/md5-cache/virtual/perl-IO-Compress-2.103.0-r1
+++ b/metadata/md5-cache/virtual/perl-IO-Compress-2.103.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for IO-Compress
 EAPI=8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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.34.1-r3 ~perl-core/IO-Compress-2.103.0 ) dev-lang/perl:= !<perl-core/IO-Compress-2.103.0 !>perl-core/IO-Compress-2.103.0-r999 >=virtual/perl-Compress-Raw-Zlib-2.103.0 >=virtual/perl-Compress-Raw-Bzip2-2.103.0
 SLOT=0
-_md5_=96b91c67ad7971a0a9a418d28041fa98
+_md5_=456770b3c29d75ec94b8dfbd40e9792c
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index c178f211bc9f..4ca9ce4b1b30 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/element-1.10.7 b/metadata/md5-cache/www-apps/element-1.10.11
similarity index 88%
rename from metadata/md5-cache/www-apps/element-1.10.7
rename to metadata/md5-cache/www-apps/element-1.10.11
index bc6192e5b45a..d4d465358ac8 100644
--- a/metadata/md5-cache/www-apps/element-1.10.7
+++ b/metadata/md5-cache/www-apps/element-1.10.11
@@ -3,11 +3,12 @@ DEPEND=|| ( virtual/httpd-basic virtual/httpd-cgi virtual/httpd-fastcgi ) app-ad
 DESCRIPTION=A glossy Matrix collaboration client for the web
 EAPI=8
 HOMEPAGE=https://element.io/
+INHERIT=webapp
 IUSE=vhosts
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=app-admin/webapp-config
-SLOT=1.10.7
-SRC_URI=https://github.com/vector-im/element-web/releases/download/v1.10.7/element-v1.10.7.tar.gz
+SLOT=1.10.11
+SRC_URI=https://github.com/vector-im/element-web/releases/download/v1.10.11/element-v1.10.11.tar.gz
 _eclasses_=webapp	d872f28d7595b70dd46545199ef35fb0
 _md5_=c78809ecdea24af42e1a2503a5b9ed86
diff --git a/metadata/md5-cache/www-apps/element-1.10.8 b/metadata/md5-cache/www-apps/element-1.10.8
deleted file mode 100644
index ba3267d8f373..000000000000
--- a/metadata/md5-cache/www-apps/element-1.10.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-basic virtual/httpd-cgi virtual/httpd-fastcgi ) app-admin/webapp-config
-DESCRIPTION=A glossy Matrix collaboration client for the web
-EAPI=8
-HOMEPAGE=https://element.io/
-IUSE=vhosts
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=app-admin/webapp-config
-SLOT=1.10.8
-SRC_URI=https://github.com/vector-im/element-web/releases/download/v1.10.8/element-v1.10.8.tar.gz
-_eclasses_=webapp	d872f28d7595b70dd46545199ef35fb0
-_md5_=c78809ecdea24af42e1a2503a5b9ed86
diff --git a/metadata/md5-cache/www-apps/miniflux-2.0.36 b/metadata/md5-cache/www-apps/miniflux-2.0.36
new file mode 100644
index 000000000000..659583027aa5
--- /dev/null
+++ b/metadata/md5-cache/www-apps/miniflux-2.0.36
@@ -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=strip
+SLOT=0
+SRC_URI=https://github.com/miniflux/v2/archive/2.0.36.tar.gz -> miniflux-2.0.36.tar.gz https://dev.gentoo.org/~concord/distfiles/miniflux-2.0.36-deps.tar.xz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=827bcd196244ee98cde8c8e00bc73eb5
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index c367b819937d..2f2ffada8fed 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-101.0.4951.54 b/metadata/md5-cache/www-client/chromium-101.0.4951.54
index 8700e17e38d6..58a496916b75 100644
--- a/metadata/md5-cache/www-client/chromium-101.0.4951.54
+++ b/metadata/md5-cache/www-client/chromium-101.0.4951.54
@@ -13,4 +13,4 @@ REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland )
 SLOT=0/stable
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-101.0.4951.54.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-101-patchset-4/chromium-101-patchset-4.tar.xz
 _eclasses_=check-reqs	82234bf011d5453330773cd5fc3f0199	chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=797936dd6477f1461bc7254543276751
+_md5_=c7f2340b349506a0886d9bdb4f75d95d
diff --git a/metadata/md5-cache/www-client/chromium-102.0.4997.0 b/metadata/md5-cache/www-client/chromium-102.0.4997.0
deleted file mode 100644
index 28a38b55bb36..000000000000
--- a/metadata/md5-cache/www-client/chromium-102.0.4997.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=system-icu? ( >=dev-libs/icu-69.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] ) 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 ) dev-lang/perl >=dev-util/gn-0.1807 >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=system-icu? ( >=dev-libs/icu-69.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] ) 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? ( x11-libs/gdk-pixbuf:2 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:= virtual/opengl >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/pango:= ) !headless? ( gtk4? ( gui-libs/gtk:4[X,wayland?] ) !gtk4? ( x11-libs/gtk+:3[X,wayland?] ) )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=8
-HOMEPAGE=https://chromium.org/
-INHERIT=check-reqs chromium-2 desktop flag-o-matic ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
-IUSE=component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx +official 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
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=system-icu? ( >=dev-libs/icu-69.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] ) 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? ( x11-libs/gdk-pixbuf:2 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:= virtual/opengl >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= 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 )
-SLOT=0/dev
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-102.0.4997.0.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-102-patchset-3/chromium-102-patchset-3.tar.xz
-_eclasses_=check-reqs	82234bf011d5453330773cd5fc3f0199	chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3aa136427b6144213e893da55fe970c9
diff --git a/metadata/md5-cache/www-client/chromium-101.0.4951.34 b/metadata/md5-cache/www-client/chromium-102.0.5005.40
similarity index 94%
rename from metadata/md5-cache/www-client/chromium-101.0.4951.34
rename to metadata/md5-cache/www-client/chromium-102.0.5005.40
index 3aa21d702761..dfa756a5ed27 100644
--- a/metadata/md5-cache/www-client/chromium-101.0.4951.34
+++ b/metadata/md5-cache/www-client/chromium-102.0.5005.40
@@ -1,4 +1,4 @@
-BDEPEND=system-icu? ( >=dev-libs/icu-69.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] ) 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 ) dev-lang/perl >=dev-util/gn-0.1807 >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre )
+BDEPEND=system-icu? ( >=dev-libs/icu-69.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] ) 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 ) 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 )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
 DEPEND=system-icu? ( >=dev-libs/icu-69.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] ) 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? ( x11-libs/gdk-pixbuf:2 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:= virtual/opengl >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/pango:= ) !headless? ( gtk4? ( gui-libs/gtk:4[X,wayland?] ) !gtk4? ( x11-libs/gtk+:3[X,wayland?] ) )
 DESCRIPTION=Open-source version of Google Chrome web browser
@@ -11,6 +11,6 @@ LICENSE=BSD
 RDEPEND=system-icu? ( >=dev-libs/icu-69.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] ) 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? ( x11-libs/gdk-pixbuf:2 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:= virtual/opengl >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= 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 )
 SLOT=0/beta
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-101.0.4951.34.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-101-patchset-4/chromium-101-patchset-4.tar.xz
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-102.0.5005.40.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-102-patchset-5/chromium-102-patchset-5.tar.xz
 _eclasses_=check-reqs	82234bf011d5453330773cd5fc3f0199	chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9e596104efd8125c69e541bbb82039c2
+_md5_=a41fb7bb7d2619727679aefac02e2850
diff --git a/metadata/md5-cache/www-client/chromium-103.0.5042.0 b/metadata/md5-cache/www-client/chromium-103.0.5042.0
new file mode 100644
index 000000000000..28f0898d5590
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-103.0.5042.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 ) 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 )
+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?] ) )
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=8
+HOMEPAGE=https://chromium.org/
+INHERIT=check-reqs chromium-2 desktop flag-o-matic ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
+IUSE=+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx +official 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
+KEYWORDS=~amd64 ~arm64 ~x86
+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
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-103.0.5042.0.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-103-patchset-2/chromium-103-patchset-2.tar.xz
+_eclasses_=check-reqs	82234bf011d5453330773cd5fc3f0199	chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=0511ae8fbdcae2e0fcf45d2485de11f9
diff --git a/metadata/md5-cache/www-client/chromium-bin-100.0.4896.127 b/metadata/md5-cache/www-client/chromium-bin-101.0.4951.54
similarity index 62%
rename from metadata/md5-cache/www-client/chromium-bin-100.0.4896.127
rename to metadata/md5-cache/www-client/chromium-bin-101.0.4951.54
index 8d2f71149b75..f6ea59dab8ed 100644
--- a/metadata/md5-cache/www-client/chromium-bin-100.0.4896.127
+++ b/metadata/md5-cache/www-client/chromium-bin-101.0.4951.54
@@ -2,11 +2,12 @@ DEFINED_PHASES=install postinst postrm pretend setup unpack
 DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=8
 HOMEPAGE=https://chromium.org/
+INHERIT=chromium-2 desktop pax-utils readme.gentoo-r1 unpacker xdg-utils
 IUSE=cpu_flags_x86_sse2 suid +swiftshader wayland widevine +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_vi +l10n_zh-CN +l10n_zh-TW
 KEYWORDS=-* ~amd64 ~arm64 ~x86
 LICENSE=BSD
 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/libxml2[icu] dev-libs/libxslt dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/flac media-libs/fontconfig >=media-libs/freetype-2.11.0-r1 media-libs/libjpeg-turbo media-libs/libwebp media-libs/mesa[gbm(+)] media-libs/openh264:0/6.1 net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/pciutils >=sys-devel/gcc-9.3.0 >=sys-libs/glibc-2.32 sys-libs/zlib[minizip] virtual/ttf-fonts virtual/udev x11-libs/cairo x11-libs/libdrm x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X,wayland?] gui-libs/gtk:4[X,wayland?] ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils amd64? ( widevine? ( www-plugins/chrome-binary-plugins ) ) wayland? ( dev-libs/wayland )
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-100.0.4896.127-1-common.tar.xz https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-100.0.4896.127-1-l10n.tar.xz amd64? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-100.0.4896.127-1-common-x86_64.tar.xz wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-100.0.4896.127-1-wayland-x86_64.tar.xz ) !wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-100.0.4896.127-1-x11-x86_64.tar.xz ) ) arm64? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-100.0.4896.127-1-common-aarch64.tar.xz wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-100.0.4896.127-1-wayland-aarch64.tar.xz ) !wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-100.0.4896.127-1-x11-aarch64.tar.xz ) ) x86? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-100.0.4896.127-1-common-i686.tar.xz wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-100.0.4896.127-1-wayland-i686.tar.xz ) !wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-100.0.4896.127-1-x11-i686.tar.xz ) )
+SRC_URI=https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-101.0.4951.54-1-common.tar.xz https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-101.0.4951.54-1-l10n.tar.xz amd64? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-101.0.4951.54-1-common-x86_64.tar.xz wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-101.0.4951.54-1-wayland-x86_64.tar.xz ) !wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-101.0.4951.54-1-x11-x86_64.tar.xz ) ) arm64? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-101.0.4951.54-1-common-aarch64.tar.xz wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-101.0.4951.54-1-wayland-aarch64.tar.xz ) !wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-101.0.4951.54-1-x11-aarch64.tar.xz ) ) x86? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-101.0.4951.54-1-common-i686.tar.xz wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-101.0.4951.54-1-wayland-i686.tar.xz ) !wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-101.0.4951.54-1-x11-i686.tar.xz ) )
 _eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	pax-utils	91d47e5d20627c717aa878b9167c62a8	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	697382d119fd3d195f110b7979184285	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=bd98ed2f0ea08f791103fa4ed2ffbf4f
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-102.0.1224.0 b/metadata/md5-cache/www-client/microsoft-edge-dev-102.0.1245.3
similarity index 92%
rename from metadata/md5-cache/www-client/microsoft-edge-dev-102.0.1224.0
rename to metadata/md5-cache/www-client/microsoft-edge-dev-102.0.1245.3
index cd512f7114d0..043cb9c20afb 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-dev-102.0.1224.0
+++ b/metadata/md5-cache/www-client/microsoft-edge-dev-102.0.1245.3
@@ -2,12 +2,13 @@ DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
 DESCRIPTION=The web browser from Microsoft
 EAPI=8
 HOMEPAGE=https://www.microsoft.com/en-us/edge
+INHERIT=chromium-2 desktop pax-utils unpacker xdg
 IUSE=+mip
 KEYWORDS=-* ~amd64
 LICENSE=microsoft-edge
 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 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 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 mip? ( app-crypt/libsecret )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_102.0.1224.0-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_102.0.1245.3-1_amd64.deb
 _eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7b79a8f51cfe4d4f62e90c71634a4fd3
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 1a65212cea53..5eadd9d0e2c7 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/cairo-1.16.0-r5 b/metadata/md5-cache/x11-libs/cairo-1.16.0-r5
index 9d579e6db9df..32b07eaf64ef 100644
--- a/metadata/md5-cache/x11-libs/cairo-1.16.0-r5
+++ b/metadata/md5-cache/x11-libs/cairo-1.16.0-r5
@@ -4,8 +4,9 @@ DEPEND=>=dev-libs/lzo-2.06-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_
 DESCRIPTION=A vector graphics library with cross-device output support
 EAPI=7
 HOMEPAGE=https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo
+INHERIT=flag-o-matic autotools multilib-minimal
 IUSE=X aqua debug gles2-only +glib opengl static-libs +svg utils 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 ~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 MPL-1.1 )
 RDEPEND=>=dev-libs/lzo-2.06-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/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(-)?] >=media-libs/freetype-2.5.0.1:2[png,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-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(-)?] sys-libs/binutils-libs:0=[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(-)?] >=x11-libs/pixman-0.32.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(-)?] gles2-only? ( >=media-libs/mesa-9.1.6[gles2,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.34.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(-)?] ) opengl? ( >=media-libs/mesa-9.1.6[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(-)?] ) X? ( >=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/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/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/libxcb-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(-)?] )
 REQUIRED_USE=gles2-only? ( !opengl )
@@ -13,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.cairographics.org/releases/cairo-1.16.0.tar.xz
 _eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d16c5b898ea9dbc8707efab260ee64be
+_md5_=bf3f46b6a87897b0f595420281d8db6f
diff --git a/metadata/md5-cache/x11-libs/cairo-9999 b/metadata/md5-cache/x11-libs/cairo-9999
index 6781f757daae..138ebc4d1277 100644
--- a/metadata/md5-cache/x11-libs/cairo-9999
+++ b/metadata/md5-cache/x11-libs/cairo-9999
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/lzo-2.06-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_
 DESCRIPTION=A vector graphics library with cross-device output support
 EAPI=7
 HOMEPAGE=https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo
+INHERIT=flag-o-matic autotools multilib-minimal git-r3
 IUSE=X aqua debug gles2-only +glib opengl static-libs +svg utils 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
 LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 PROPERTIES=live
@@ -12,4 +13,4 @@ REQUIRED_USE=gles2-only? ( !opengl )
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=74ae0e565e440113fa5e6d09e1acbdc4
+_md5_=ead26dcead94ab0741e19b760ff6963f
diff --git a/metadata/md5-cache/x11-libs/pixman-0.40.0 b/metadata/md5-cache/x11-libs/pixman-0.40.0
index fbd349464b61..378cc0f0963e 100644
--- a/metadata/md5-cache/x11-libs/pixman-0.40.0
+++ b/metadata/md5-cache/x11-libs/pixman-0.40.0
@@ -5,9 +5,9 @@ EAPI=7
 HOMEPAGE=http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/
 INHERIT=flag-o-matic meson-multilib multiprocessing toolchain-funcs
 IUSE=cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 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 ~m68k ~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 ~m68k ~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=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/pixman-0.40.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	meson	4e69b4b5d15387549776392e83e8c42c	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=98b6628477710e8e9686e209af6dc20d
+_md5_=4c3e6ed9b35cfe2ebe69f204835e62dd
diff --git a/metadata/md5-cache/x11-libs/pixman-9999 b/metadata/md5-cache/x11-libs/pixman-9999
index 70b8bffb88b2..e5ed97c40e57 100644
--- a/metadata/md5-cache/x11-libs/pixman-9999
+++ b/metadata/md5-cache/x11-libs/pixman-9999
@@ -9,4 +9,4 @@ LICENSE=MIT
 PROPERTIES=live
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	4e69b4b5d15387549776392e83e8c42c	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a5bb20c9ff43489f1c8541a50ea767ae
+_md5_=6da6d371dd9b0a77783462c651613f82
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index cb61c484d799..5b076dd5fb66 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/mutter-42.1 b/metadata/md5-cache/x11-wm/mutter-42.1
new file mode 100644
index 000000000000..33e096d5fb77
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/mutter-42.1
@@ -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
+REQUIRED_USE=wayland? ( ^^ ( elogind systemd ) udev ) test? ( wayland )
+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	4e69b4b5d15387549776392e83e8c42c	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	891c4d3862cbc1ce8808ea427facbcd1	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	6d4bdf68f7dcd9a5491613be687ae665	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5980faf3d9a92bf1c15a40c5b985b86d
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 6b6d560c8908..44d479d786d7 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 16646 BLAKE2B f98dbb8381e54732fcab811e5baca79a1c4636d929015f5842341b17f7404bd3cc3d9a7a6cae1301a6857e7850e06c9c87705ecfca1d3f7635d9d8e947c91e86 SHA512 c19b68f5fa845e539d31e6b3ac15abc038dc2a3c31b78934a267a70d0b03db54ad105e2a9aef049b7b5c15a18b97b4b42f8e7048845d569ab74fcaac72ddd189
-TIMESTAMP 2022-05-06T16:09:47Z
+TIMESTAMP 2022-05-07T08:09:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmJ1SEtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmJ2KUpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCfBhAApks2h4tGqNrt5DJRdwetR2UvY0L/90i2eYJYd1xl0NwDQENimFxRBMzf
-+WNY7Xs+D5fQ3vFArL64/Ih1Hvlouq98hV71ODtPyL9VP1GhHmXTZEzdafu4LiRD
-Xohb6ck6wEX1DUR+YzLxyyWshKm8KliCe0sp9Nhpjz6LA8Q6YSqnTDSWqE1cvalM
-SGVdbgjy2XnPldeBign15xgmALvmBwc1hysQNXsVyELslR3TF0pw/xU0dalfzqdV
-5Lw9mHY6Y5ETDy0nkwPUamWcDVcoMNwFVjQuFJOxxsM6Naihpts/R16ZnuzhYewG
-peww/t/KNBeVtw4oduvzYC1vAnFz+CCSWJsIWuXM22557ZhUHpO5g60ddtJfbEM4
-R86ljeLDIYV05iZbq+yrhvXk/wAG1lSK6RDkOfRIcTiex6XLDRua8WPs4+L/zS8L
-ThIFC9SClRTOlXHMCb3MbK5sNEyzb174ke7YspJjiswEKcRVJYSekZEdl482qcTO
-8gVffVRQEH08MTnywezNHfXdO8lmz90pnITLVCjr5NItA54aAFW5WSBOc09Fkxpg
-N0bxtVItuiwfzZoIeR/ZZT1eiwbLXYNq3Nd1ao4WsLHyVN51UG0Q2b/cP/k0/1/D
-SRumCSkJ9JetMIKFWw2+vfEnPctBSx3L8kTsJVoj/laC/zGLEb8=
-=56YZ
+klBCIhAArUy+D7GiAV7dkdO5xEgPnNZvks8MMjdG2KNHMAi5ahJSYVLvtxV06Ctc
+u5GMtq/cbabVURIHyd+wG7EdLO0k6UkjxJez/nsKjmCgyGdkMevqDBl1opUXjLqW
+5wxApDMSLUHGf1ZK4GeEbtfh1FTWuI/YqwMP5/BjQhxSRiYb9ZDmJh2wP8bg491w
+kzgpMWJMVHdE3LEuvCQdqXHdBs2PR3jLWyD/CmTkjY1c1s8xW2GtLzQisyiqqSvF
+2oo2r9rtfJyj7rfvG/ISWRoN1adqlol1NDbFO3PzZVXY+iSCUOdEUC/lR0pM9LgV
+StPurluhjWdRrQe9YqfLNX9Bgt0HC0Yjgk4WKJpMxIPakAWI4vXr7yWqiQG2m/pf
+SyGPKr4GaIdlOnT4+AHZxsXVD+4ssaAxMg0fQC0n3scXnba3xtQONqu/vFmVev6e
+zUWcjmYIylXQ+1hH2JfxqyEWytKgQtmuDcTboO1QPQnEzqlfpTd3nxuFTpAZFji4
+DSwsADJZKwoK/RpqzR15nKUpAgpk56FRhhY2k12/4EXTjvtTh+wk3gHohIP/1dAA
+Bo6DtifT3QOfC+fTsXx4Rw+PJGc/+EY8jupbC1CJMe7vM05Sxq5Lc5se1Bt9jzsF
+GOdeMhzb/iiIQED3z33CFHnj8ObqmyJtE3i3sanVFdjfWRpYKI8=
+=W0iW
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 3c3b271e0e15..4ebf16f67793 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 06 May 2022 16:09:42 +0000
+Sat, 07 May 2022 08:09:43 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 85bfa1113619..09525907b2f1 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -754,12 +754,6 @@
       <role>Minion</role>
     </member>
   </project>
-  <project>
-    <email>dotnet@gentoo.org</email>
-    <name>Dotnet Project</name>
-    <url>https://wiki.gentoo.org/wiki/Project:Dotnet</url>
-    <description>The Dotnet Project handles Microsoft .NET Framework related packages in the Gentoo package tree.</description>
-  </project>
   <project>
     <email>ejabberd@gentoo.org</email>
     <name>ejabberd Project</name>
diff --git a/metadata/timestamp b/metadata/timestamp
index 7610197de2f1..7238ce88ee50 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri May  6 04:09:42 PM UTC 2022
+Sat May  7 08:09:42 AM UTC 2022
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 8f83afcaac85..609f74ee1b0f 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -877,6 +877,7 @@
 2204052239 ./acct-user/rrdcached/rrdcached-0.ebuild
 2204101640 ./acct-user/openttd/openttd-0.ebuild
 2204271910 ./acct-user/headscale/headscale-0.ebuild
+2205062240 ./acct-user/miniflux/miniflux-0.ebuild
 2107081639 ./app-accessibility/accerciser/accerciser-3.38.0.ebuild
 2111180910 ./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
@@ -887,7 +888,7 @@
 2201310609 ./app-accessibility/brltty/brltty-6.4.ebuild
 2203100310 ./app-accessibility/brltty/brltty-6.4-r1.ebuild
 2112242309 ./app-accessibility/caribou/caribou-0.4.21-r4.ebuild
-2111120512 ./app-accessibility/edbrowse/edbrowse-3.7.5.1-r3.ebuild
+2205070840 ./app-accessibility/edbrowse/edbrowse-3.8.2.1-r1.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
@@ -1182,7 +1183,7 @@
 2203270410 ./app-admin/salt/salt-3003.3-r1.ebuild
 2203312010 ./app-admin/salt/salt-3002.8.ebuild
 2203311940 ./app-admin/salt/salt-3003.4-r1.ebuild
-2204182210 ./app-admin/salt/salt-3004.1-r4.ebuild
+2205062310 ./app-admin/salt/salt-3004.1-r4.ebuild
 2107050640 ./app-admin/selint/selint-1.1.0.ebuild
 2107050640 ./app-admin/selint/selint-1.2.0.ebuild
 2201312309 ./app-admin/selint/selint-1.2.1.ebuild
@@ -1260,9 +1261,12 @@
 2007231539 ./app-admin/whowatch/whowatch-99999.ebuild
 2109091809 ./app-admin/xkcdpass/xkcdpass-1.19.3.ebuild
 2105171109 ./app-admin/xstow/xstow-1.0.2.ebuild
+2205070740 ./app-admin/xstow/xstow-1.0.2-r1.ebuild
 1712300140 ./app-admin/xtail/xtail-2.1-r1.ebuild
 2203212309 ./app-admin/yadm/yadm-3.2.1.ebuild
 2112080309 ./app-admin/mkosi/mkosi-12-r1.ebuild
+2205070910 ./app-admin/tpm/tpm-1.3.3.ebuild
+2205070910 ./app-admin/tpm/tpm-9999.ebuild
 2201130040 ./app-antivirus/clamav/clamav-0.104.2.ebuild
 2205061210 ./app-antivirus/clamav/clamav-0.103.6.ebuild
 2112232239 ./app-antivirus/clamtk/clamtk-6.14.ebuild
@@ -1764,8 +1768,7 @@
 2104060140 ./app-crypt/shash/shash-0.2.6-r3.ebuild
 2012202239 ./app-crypt/signify/signify-30.ebuild
 2204290652 ./app-crypt/signify/signify-30-r2.ebuild
-2001101209 ./app-crypt/signing-party/signing-party-2.10-r1.ebuild
-2007122009 ./app-crypt/signing-party/signing-party-2.11.ebuild
+2205062310 ./app-crypt/signing-party/signing-party-2.11.ebuild
 2105022039 ./app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.06.ebuild
 1905062039 ./app-crypt/ssdeep/ssdeep-2.14.1.ebuild
 2202100210 ./app-crypt/ssss/ssss-0.5.7-r1.ebuild
@@ -2425,6 +2428,7 @@
 2104042209 ./app-doc/gnucash-docs/gnucash-docs-4.4.ebuild
 2105051309 ./app-doc/gnucash-docs/gnucash-docs-4.5.ebuild
 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
 2112121739 ./app-doc/jargon/jargon-4.4.7-r1.ebuild
 2112041439 ./app-doc/kicad-doc/kicad-doc-5.1.12.ebuild
@@ -2534,18 +2538,17 @@
 2110291639 ./app-editors/ee/ee-1.5.2-r1.ebuild
 2110220439 ./app-editors/elvis/elvis-2.2.0-r8.ebuild
 2107181239 ./app-editors/emacs/emacs-18.59-r14.ebuild
-2107181239 ./app-editors/emacs/emacs-23.4-r21.ebuild
-2108261809 ./app-editors/emacs/emacs-26.3-r6.ebuild
-2203311510 ./app-editors/emacs/emacs-24.5-r11.ebuild
-2203311510 ./app-editors/emacs/emacs-25.3-r11.ebuild
-2203311510 ./app-editors/emacs/emacs-27.2-r5.ebuild
-2204111010 ./app-editors/emacs/emacs-28.1.ebuild
-2204201539 ./app-editors/emacs/emacs-28.1.9999.ebuild
-2204201539 ./app-editors/emacs/emacs-29.0.9999.ebuild
-2205050840 ./app-editors/emacs/emacs-26.3-r7.ebuild
+2205070940 ./app-editors/emacs/emacs-23.4-r21.ebuild
+2205070940 ./app-editors/emacs/emacs-24.5-r11.ebuild
+2205070940 ./app-editors/emacs/emacs-25.3-r11.ebuild
+2205070940 ./app-editors/emacs/emacs-26.3-r7.ebuild
+2205070940 ./app-editors/emacs/emacs-27.2-r5.ebuild
+2205070940 ./app-editors/emacs/emacs-28.1.9999.ebuild
+2205070940 ./app-editors/emacs/emacs-28.1.ebuild
+2205070940 ./app-editors/emacs/emacs-29.0.9999.ebuild
 2110220439 ./app-editors/emact/emact-2.58.0-r1.ebuild
 2110291639 ./app-editors/ersatz-emacs/ersatz-emacs-20060515-r1.ebuild
-2110260439 ./app-editors/fe/fe-2.0-r1.ebuild
+2205070040 ./app-editors/fe/fe-2.0-r1.ebuild
 2110291639 ./app-editors/featherpad/featherpad-1.0.0.ebuild
 2111120512 ./app-editors/featherpad/featherpad-1.0.1.ebuild
 2201122009 ./app-editors/featherpad/featherpad-1.1.0.ebuild
@@ -2770,7 +2773,7 @@
 2204171140 ./app-emacs/ebuild-mode/ebuild-mode-1.56.ebuild
 2204301040 ./app-emacs/ebuild-mode/ebuild-mode-1.57.ebuild
 2107131039 ./app-emacs/ebuild-run-mode/ebuild-run-mode-20210713.ebuild
-1906271039 ./app-emacs/ecb/ecb-2.50_pre20170728.ebuild
+2205062240 ./app-emacs/ecb/ecb-2.50_pre20170728.ebuild
 1802210008 ./app-emacs/edb/edb-1.32.ebuild
 2104122109 ./app-emacs/edit-list/edit-list-0.3.ebuild
 1806012008 ./app-emacs/edit-server/edit-server-1.15.ebuild
@@ -3125,6 +3128,7 @@
 2205042010 ./app-emacs/emacs-ipython-notebook/emacs-ipython-notebook-0.17.0_p20220419.ebuild
 2205041610 ./app-emacs/polymode/polymode-0.2.2_p20220322.ebuild
 2205051440 ./app-emacs/typescript-mode/typescript-mode-0.4.ebuild
+2205070110 ./app-emacs/rainbow-mode/rainbow-mode-1.0.6.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
@@ -3301,7 +3305,7 @@
 2201011409 ./app-eselect/eselect-emacs/eselect-emacs-1.19.ebuild
 2204020640 ./app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
 2204020640 ./app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r2.ebuild
-2204030339 ./app-eselect/eselect-fontconfig/eselect-fontconfig-20220403.ebuild
+2205070740 ./app-eselect/eselect-fontconfig/eselect-fontconfig-20220403.ebuild
 2202080810 ./app-eselect/eselect-gnome-shell-extensions/eselect-gnome-shell-extensions-20180306.ebuild
 2106290045 ./app-eselect/eselect-gradle/eselect-gradle-9999.ebuild
 2112121309 ./app-eselect/eselect-gradle/eselect-gradle-0.2-r1.ebuild
@@ -3437,8 +3441,8 @@
 2110151709 ./app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.3.ebuild
 1708161714 ./app-i18n/ibus-table-extraphrase/ibus-table-extraphrase-1.3.9.20110826.ebuild
 1708161717 ./app-i18n/ibus-table-latin/ibus-table-latin-1.2.0.20100305.ebuild
-2110151709 ./app-i18n/ibus-table-others/ibus-table-others-1.3.11.ebuild
-2111081639 ./app-i18n/ibus-table-others/ibus-table-others-1.3.12.ebuild
+2205071010 ./app-i18n/ibus-table-others/ibus-table-others-1.3.12.ebuild
+2205071010 ./app-i18n/ibus-table-others/ibus-table-others-1.3.13.ebuild
 2110310939 ./app-i18n/ibus-table/ibus-table-1.14.1.ebuild
 2202051809 ./app-i18n/ibus-table/ibus-table-1.16.7.ebuild
 2204160540 ./app-i18n/ibus-typing-booster/ibus-typing-booster-2.15.22.ebuild
@@ -3568,6 +3572,7 @@
 2104131039 ./app-laptop/thinkfan/thinkfan-1.0.2.ebuild
 2104131039 ./app-laptop/thinkfan/thinkfan-1.2.1.ebuild
 2204251239 ./app-laptop/thinkfan/thinkfan-1.2.2.ebuild
+2205070740 ./app-laptop/thinkfan/thinkfan-1.3.1.ebuild
 2008081539 ./app-laptop/tp_smapi/tp_smapi-0.43-r1.ebuild
 2102150339 ./app-laptop/tpacpi-bat/tpacpi-bat-3.0-r1.ebuild
 2102150339 ./app-laptop/tpacpi-bat/tpacpi-bat-3.1.ebuild
@@ -3625,6 +3630,8 @@
 2107182009 ./app-metrics/uwsgi_exporter/uwsgi_exporter-0.8.0-r1.ebuild
 2103071539 ./app-metrics/vault_exporter/vault_exporter-0.1.2-r1.ebuild
 2205060140 ./app-metrics/ceph_exporter/ceph_exporter-4.0.1.ebuild
+2205062040 ./app-metrics/ceph_exporter/ceph_exporter-2.0.7.ebuild
+2205062040 ./app-metrics/ceph_exporter/ceph_exporter-3.0.0.ebuild
 2006041239 ./app-misc/abduco/abduco-0.6.ebuild
 2108010139 ./app-misc/abook/abook-0.6.1-r4.ebuild
 1806092239 ./app-misc/acdctl/acdctl-1.1-r1.ebuild
@@ -3880,6 +3887,7 @@
 2104230039 ./app-misc/nnn/nnn-3.6.ebuild
 2104230039 ./app-misc/nnn/nnn-4.0.ebuild
 2111201739 ./app-misc/nnn/nnn-4.3.ebuild
+2205062210 ./app-misc/nnn/nnn-4.5.ebuild
 2011051039 ./app-misc/no-more-secrets/no-more-secrets-0.3.3.ebuild
 2011051039 ./app-misc/no-more-secrets/no-more-secrets-9999.ebuild
 2204190010 ./app-misc/notary/notary-0.7.0.ebuild
@@ -4101,6 +4109,7 @@
 2106032239 ./app-office/gnucash/gnucash-4.4.ebuild
 2106032239 ./app-office/gnucash/gnucash-4.5.ebuild
 2203301740 ./app-office/gnucash/gnucash-4.8.ebuild
+2205070810 ./app-office/gnucash/gnucash-4.10.ebuild
 2204161540 ./app-office/gnumeric/gnumeric-1.12.51.ebuild
 2205030110 ./app-office/gnumeric/gnumeric-1.12.52.ebuild
 2203192040 ./app-office/grisbi/grisbi-2.0.5.ebuild
@@ -4129,6 +4138,7 @@
 2204130309 ./app-office/libreoffice/libreoffice-9999.ebuild
 2205020310 ./app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild
 2204161540 ./app-office/lyx/lyx-2.3.6.1-r1.ebuild
+2205070710 ./app-office/lyx/lyx-2.3.6.1-r2.ebuild
 2104192239 ./app-office/magicpoint/magicpoint-1.13a_p20121015-r2.ebuild
 2204130309 ./app-office/mdbtools/mdbtools-1.0.0.ebuild
 2202100210 ./app-office/moneydance/moneydance-2022.4060.ebuild
@@ -4283,8 +4293,8 @@
 2003261841 ./app-portage/ufed/ufed-9999.ebuild
 2112291609 ./app-portage/unsymlink-lib/unsymlink-lib-20.ebuild
 2201280010 ./app-shells/autojump/autojump-22.5.3-r1.ebuild
-2204231840 ./app-shells/bash-completion/bash-completion-2.11.ebuild
-2204231840 ./app-shells/bash-completion/bash-completion-9999.ebuild
+2205071110 ./app-shells/bash-completion/bash-completion-2.11.ebuild
+2205071110 ./app-shells/bash-completion/bash-completion-9999.ebuild
 2204070310 ./app-shells/bash/bash-2.05b_p13.ebuild
 2204070310 ./app-shells/bash/bash-3.0_p22.ebuild
 2204070310 ./app-shells/bash/bash-3.1_p23.ebuild
@@ -4349,8 +4359,6 @@
 1702282250 ./app-shells/psh/psh-1.8.1-r3.ebuild
 2104060140 ./app-shells/push/push-2.0-r1.ebuild
 2104060140 ./app-shells/push/push-3.4.ebuild
-2109192209 ./app-shells/pwsh-bin/pwsh-bin-7.1.4.ebuild
-2111210409 ./app-shells/pwsh-bin/pwsh-bin-7.2.0.ebuild
 2112150739 ./app-shells/pwsh-bin/pwsh-bin-7.2.1.ebuild
 2104060140 ./app-shells/quoter/quoter-4.2.ebuild
 2202270409 ./app-shells/rc/rc-1.7.4-r2.ebuild
@@ -4823,7 +4831,7 @@
 2205021340 ./app-text/zotero-bin/zotero-bin-6.0.6.ebuild
 2202091840 ./app-text/mdbook/mdbook-0.4.15.ebuild
 2204291439 ./app-text/mdbook/mdbook-0.4.18.ebuild
-2205050840 ./app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild
+2205062310 ./app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild
 2202101339 ./app-text/ronn-ng/ronn-ng-0.9.1.ebuild
 2203100310 ./app-text/ronn-ng/ronn-ng-0.9.1-r1.ebuild
 2112280040 ./app-text/fzy/fzy-1.0-r1.ebuild
@@ -5578,6 +5586,7 @@
 2204262240 ./dev-db/sqlite/sqlite-3.38.1.ebuild
 2204290540 ./dev-db/sqlite/sqlite-3.38.2.ebuild
 2204291110 ./dev-db/sqlite/sqlite-3.38.3.ebuild
+2205062240 ./dev-db/sqlite/sqlite-3.38.5.ebuild
 2102171509 ./dev-db/sqlitebrowser/sqlitebrowser-3.12.1.ebuild
 2107160109 ./dev-db/sqlitebrowser/sqlitebrowser-3.12.2.ebuild
 2102171509 ./dev-db/sqlitebrowser/sqlitebrowser-9999.ebuild
@@ -5597,15 +5606,9 @@
 2203122109 ./dev-db/pglogical/pglogical-2.4.1.ebuild
 2204050639 ./dev-db/sqlmap/sqlmap-1.6.2.ebuild
 2204050639 ./dev-db/sqlmap/sqlmap-9999.ebuild
-2202122309 ./dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-3.1.416.ebuild
-2202122309 ./dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-5.0.301.ebuild
-2202122309 ./dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-5.0.405.ebuild
-2202122309 ./dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.100.ebuild
-2202122309 ./dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.101.ebuild
-2202122309 ./dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.102.ebuild
-2203131909 ./dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-3.1.417.ebuild
-2203131909 ./dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-5.0.406.ebuild
-2203131909 ./dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.201.ebuild
+2205062310 ./dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-3.1.418-r1.ebuild
+2205062310 ./dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-5.0.407-r1.ebuild
+2205062310 ./dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.202-r1.ebuild
 2112052139 ./dev-dotnet/libgdiplus/libgdiplus-6.0.2-r1.ebuild
 2104180939 ./dev-dotnet/monocalendar/monocalendar-0.7.2.ebuild
 2005162339 ./dev-dotnet/ndesk-dbus-glib/ndesk-dbus-glib-0.4.1.ebuild
@@ -7226,6 +7229,7 @@
 2203110239 ./dev-lang/nim/nim-1.4.8.ebuild
 2203110239 ./dev-lang/nim/nim-1.6.2.ebuild
 2203110239 ./dev-lang/nim/nim-1.6.4.ebuild
+2205062340 ./dev-lang/nim/nim-1.6.6.ebuild
 2112130339 ./dev-lang/nqp/nqp-2021.06.ebuild
 2112130339 ./dev-lang/nqp/nqp-2021.08.ebuild
 2112130339 ./dev-lang/nqp/nqp-2021.10.ebuild
@@ -7261,12 +7265,12 @@
 2204290540 ./dev-lang/python-exec/python-exec-2.4.8.ebuild
 2203161840 ./dev-lang/python/python-2.7.18_p14.ebuild
 2204061009 ./dev-lang/python/python-3.11.0_alpha7.ebuild
-2204212309 ./dev-lang/python/python-2.7.18_p15.ebuild
 2204212109 ./dev-lang/python/python-3.7.13.ebuild
 2204212109 ./dev-lang/python/python-3.9.11.ebuild
 2205010512 ./dev-lang/python/python-3.8.13.ebuild
 2205030340 ./dev-lang/python/python-3.9.12.ebuild
 2205041810 ./dev-lang/python/python-3.10.4.ebuild
+2205062310 ./dev-lang/python/python-2.7.18_p15.ebuild
 2105152009 ./dev-lang/qu-prolog/qu-prolog-10.6.ebuild
 2111290409 ./dev-lang/rakudo/rakudo-2021.06.ebuild
 2111290409 ./dev-lang/rakudo/rakudo-2021.08.ebuild
@@ -7277,7 +7281,7 @@
 2204231309 ./dev-lang/ruby/ruby-3.1.2.ebuild
 2204302241 ./dev-lang/ruby/ruby-2.6.10.ebuild
 2204302241 ./dev-lang/ruby/ruby-2.7.6.ebuild
-2205050240 ./dev-lang/ruby/ruby-3.1.2-r1.ebuild
+2205070940 ./dev-lang/ruby/ruby-3.1.2-r1.ebuild
 2201220409 ./dev-lang/rust-bin/rust-bin-1.58.1.ebuild
 2204202009 ./dev-lang/rust-bin/rust-bin-1.59.0.ebuild
 2204252140 ./dev-lang/rust-bin/rust-bin-1.60.0.ebuild
@@ -7567,8 +7571,8 @@
 2205051310 ./dev-libs/jemalloc/jemalloc-5.3.0_pre20220405.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-0.16-r1.ebuild
 2204281010 ./dev-libs/json-c/json-c-9999.ebuild
+2205070740 ./dev-libs/json-c/json-c-0.16-r1.ebuild
 2201242239 ./dev-libs/json-glib/json-glib-1.6.6-r1.ebuild
 2204291110 ./dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild
 2201240710 ./dev-libs/jsonrpc-glib/jsonrpc-glib-3.40.0.ebuild
@@ -7932,8 +7936,8 @@
 2109260239 ./dev-libs/libutf8proc/libutf8proc-2.6.1.ebuild
 2201301239 ./dev-libs/libutf8proc/libutf8proc-2.7.0.ebuild
 2202052039 ./dev-libs/libuv/libuv-1.43.0.ebuild
-2204291110 ./dev-libs/libuv/libuv-1.44.1.ebuild
 2205051310 ./dev-libs/libuv/libuv-9999.ebuild
+2205070910 ./dev-libs/libuv/libuv-1.44.1.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
@@ -8021,7 +8025,7 @@
 2103071339 ./dev-libs/nsync/nsync-1.20.1.ebuild
 2106210210 ./dev-libs/nsync/nsync-1.24.0.ebuild
 2111031339 ./dev-libs/ntl/ntl-11.4.4.ebuild
-2203260309 ./dev-libs/ntl/ntl-11.5.1-r1.ebuild
+2205070310 ./dev-libs/ntl/ntl-11.5.1-r1.ebuild
 2110271009 ./dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild
 2203271139 ./dev-libs/ocl-icd/ocl-icd-2.3.1.ebuild
 2009031709 ./dev-libs/onigmo/onigmo-6.1.3.ebuild
@@ -8060,6 +8064,7 @@
 2112160339 ./dev-libs/pkcs11-helper/pkcs11-helper-1.27.0-r1.ebuild
 2205061110 ./dev-libs/pkcs11-helper/pkcs11-helper-1.29.0.ebuild
 2202100410 ./dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.6.0.ebuild
+2205071040 ./dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.7.0.ebuild
 2203200310 ./dev-libs/pmdk/pmdk-1.9.2.ebuild
 2201031109 ./dev-libs/pocl/pocl-1.8-r2.ebuild
 2202150009 ./dev-libs/poco/poco-1.10.1.ebuild
@@ -9066,7 +9071,7 @@
 2110120039 ./dev-perl/Class-Virtual/Class-Virtual-0.80.0-r1.ebuild
 2008251339 ./dev-perl/Class-WhiteHole/Class-WhiteHole-0.40.0-r2.ebuild
 2008242239 ./dev-perl/Class-XPath/Class-XPath-1.400.0-r2.ebuild
-2205050840 ./dev-perl/Class-XSAccessor/Class-XSAccessor-1.190.0-r1.ebuild
+2205062310 ./dev-perl/Class-XSAccessor/Class-XSAccessor-1.190.0-r1.ebuild
 2107310939 ./dev-perl/Clipboard/Clipboard-0.280.0.ebuild
 2110121039 ./dev-perl/Clone-Choose/Clone-Choose-0.10.0.ebuild
 2110121039 ./dev-perl/Clone-PP/Clone-PP-1.80.0.ebuild
@@ -9203,7 +9208,7 @@
 2105141439 ./dev-perl/Data-Diver/Data-Diver-1.10.100-r2.ebuild
 2007060109 ./dev-perl/Data-Dump-Streamer/Data-Dump-Streamer-2.400.0-r1.ebuild
 2109211710 ./dev-perl/Data-Dump/Data-Dump-1.230.0-r1.ebuild
-2205050840 ./dev-perl/Data-Dump/Data-Dump-1.250.0.ebuild
+2205062310 ./dev-perl/Data-Dump/Data-Dump-1.250.0.ebuild
 2105150009 ./dev-perl/Data-DumpXML/Data-DumpXML-1.60.0-r2.ebuild
 2112310709 ./dev-perl/Data-Dumper-Concise/Data-Dumper-Concise-2.23.0-r1.ebuild
 2110171709 ./dev-perl/Data-Float/Data-Float-0.13.0-r1.ebuild
@@ -10412,7 +10417,7 @@
 2112060339 ./dev-perl/Test-Time/Test-Time-0.80.0.ebuild
 2109222239 ./dev-perl/Test-Timer/Test-Timer-2.120.0.ebuild
 2101070139 ./dev-perl/Test-Trap/Test-Trap-0.3.3.ebuild
-2205050840 ./dev-perl/Test-Trap/Test-Trap-0.3.4.ebuild
+2205062310 ./dev-perl/Test-Trap/Test-Trap-0.3.4.ebuild
 2109222239 ./dev-perl/Test-Unit-Lite/Test-Unit-Lite-0.120.200-r2.ebuild
 2203091610 ./dev-perl/Test-UseAllModules/Test-UseAllModules-0.170.0-r2.ebuild
 2109222239 ./dev-perl/Test-Version/Test-Version-2.90.0.ebuild
@@ -11650,14 +11655,12 @@
 2201270040 ./dev-python/flufl-i18n/flufl-i18n-4.0.ebuild
 2202221309 ./dev-python/flufl-lock/flufl-lock-7.0-r1.ebuild
 2109271239 ./dev-python/flufl-testing/flufl-testing-0.8.ebuild
-2203190210 ./dev-python/fonttools/fonttools-4.31.1.ebuild
 2204090041 ./dev-python/fonttools/fonttools-4.32.0.ebuild
-2204182140 ./dev-python/fonttools/fonttools-4.30.0.ebuild
-2204202009 ./dev-python/fonttools/fonttools-4.31.2.ebuild
 2204220009 ./dev-python/fonttools/fonttools-4.33.0.ebuild
 2204222009 ./dev-python/fonttools/fonttools-4.33.1.ebuild
 2204252040 ./dev-python/fonttools/fonttools-4.33.2.ebuild
-2204261610 ./dev-python/fonttools/fonttools-4.33.3.ebuild
+2205062310 ./dev-python/fonttools/fonttools-4.31.2.ebuild
+2205070740 ./dev-python/fonttools/fonttools-4.33.3.ebuild
 2205010512 ./dev-python/fqdn/fqdn-1.5.1-r1.ebuild
 2205010512 ./dev-python/freezegun/freezegun-1.2.1.ebuild
 2110151739 ./dev-python/fritzconnection/fritzconnection-1.7.1.ebuild
@@ -11668,7 +11671,7 @@
 2107130109 ./dev-python/frozen-flask/frozen-flask-0.18.ebuild
 2205010512 ./dev-python/frozenlist/frozenlist-1.3.0.ebuild
 2203151439 ./dev-python/fs/fs-2.4.15.ebuild
-2205022240 ./dev-python/fs/fs-2.4.16.ebuild
+2205070740 ./dev-python/fs/fs-2.4.16.ebuild
 2205061610 ./dev-python/fsspec/fsspec-2022.3.0.ebuild
 2202271539 ./dev-python/funcparserlib/funcparserlib-1.0.0_alpha0-r1.ebuild
 2204260640 ./dev-python/funcparserlib/funcparserlib-1.0.0_alpha1.ebuild
@@ -11821,8 +11824,7 @@
 2108020139 ./dev-python/intelhex/intelhex-2.3.0.ebuild
 2106052339 ./dev-python/intervaltree/intervaltree-3.1.0.ebuild
 2202141139 ./dev-python/iocapture/iocapture-0.1.2-r2.ebuild
-2201032239 ./dev-python/ioflo/ioflo-2.0.2-r1.ebuild
-2204161210 ./dev-python/ioflo/ioflo-2.0.2-r2.ebuild
+2205062310 ./dev-python/ioflo/ioflo-2.0.2-r2.ebuild
 2203151509 ./dev-python/ipaddr/ipaddr-2.2.0-r2.ebuild
 2108160839 ./dev-python/ipdb/ipdb-0.13.9-r1.ebuild
 2203151509 ./dev-python/ipy/ipy-1.01-r1.ebuild
@@ -11837,8 +11839,8 @@
 2202051009 ./dev-python/ipython/ipython-8.0.1.ebuild
 2202260309 ./dev-python/ipython/ipython-8.1.0.ebuild
 2203202140 ./dev-python/ipython/ipython-8.1.1.ebuild
-2205050840 ./dev-python/ipython/ipython-8.2.0.ebuild
 2205050610 ./dev-python/ipython/ipython-8.3.0-r1.ebuild
+2205062310 ./dev-python/ipython/ipython-8.2.0.ebuild
 2203151509 ./dev-python/ipython_genutils/ipython_genutils-0.2.0-r3.ebuild
 2204161140 ./dev-python/ipywidgets/ipywidgets-7.7.0.ebuild
 2204242210 ./dev-python/irc/irc-20.0.0-r1.ebuild
@@ -11937,8 +11939,7 @@
 2103310109 ./dev-python/keep/keep-2.10.1.ebuild
 2205022310 ./dev-python/keyring/keyring-23.5.0.ebuild
 2204012040 ./dev-python/keystoneauth/keystoneauth-4.5.0.ebuild
-2204192009 ./dev-python/kiwisolver/kiwisolver-1.4.1.ebuild
-2205050910 ./dev-python/kiwisolver/kiwisolver-1.4.2.ebuild
+2205062310 ./dev-python/kiwisolver/kiwisolver-1.4.2.ebuild
 2203141339 ./dev-python/klein/klein-21.8.0.ebuild
 2111081139 ./dev-python/kombu/kombu-5.2.1.ebuild
 2201130410 ./dev-python/kombu/kombu-5.2.3-r1.ebuild
@@ -12427,9 +12428,9 @@
 2105181909 ./dev-python/pylibacl/pylibacl-0.6.0.ebuild
 2203181240 ./dev-python/pylibmc/pylibmc-1.6.1-r2.ebuild
 2201081709 ./dev-python/pylint/pylint-2.12.2.ebuild
-2204262240 ./dev-python/pylint/pylint-2.13.5.ebuild
 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
 2105281739 ./dev-python/pylru/pylru-1.2.0.ebuild
 2203092240 ./dev-python/pylru/pylru-1.2.1.ebuild
 2111252209 ./dev-python/pyls-spyder/pyls-spyder-0.4.0-r1.ebuild
@@ -12566,7 +12567,7 @@
 2203121439 ./dev-python/pytest-regressions/pytest-regressions-2.3.1.ebuild
 2205010512 ./dev-python/pytest-rerunfailures/pytest-rerunfailures-10.2.ebuild
 2203310510 ./dev-python/pytest-salt-factories/pytest-salt-factories-0.121.1-r1.ebuild
-2204161210 ./dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc13.ebuild
+2205062310 ./dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc13.ebuild
 2107130139 ./dev-python/pytest-salt/pytest-salt-2020.1.27-r3.ebuild
 2203270110 ./dev-python/pytest-services/pytest-services-2.2.1.ebuild
 2205010512 ./dev-python/pytest-shutil/pytest-shutil-1.7.0-r2.ebuild
@@ -12687,8 +12688,7 @@
 2108121509 ./dev-python/python_orocos_kdl/python_orocos_kdl-1.5.0.ebuild
 2111031010 ./dev-python/python_orocos_kdl/python_orocos_kdl-1.5.1.ebuild
 2111031010 ./dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
-2102140039 ./dev-python/pythondialog/pythondialog-3.5.1.ebuild
-2205061610 ./dev-python/pythondialog/pythondialog-3.5.3.ebuild
+2205070740 ./dev-python/pythondialog/pythondialog-3.5.3.ebuild
 2203181340 ./dev-python/pythran/pythran-0.11.0.ebuild
 2203181310 ./dev-python/pytidylib/pytidylib-0.3.2-r2.ebuild
 2203290210 ./dev-python/pytimeparse/pytimeparse-1.1.8.ebuild
@@ -12739,8 +12739,7 @@
 2202042239 ./dev-python/quex/quex-0.71.2.ebuild
 2204261410 ./dev-python/radon/radon-5.1.0-r1.ebuild
 2204261410 ./dev-python/radon/radon-5.1.0-r2.ebuild
-2203310510 ./dev-python/raet/raet-0.6.8-r3.ebuild
-2204161210 ./dev-python/raet/raet-0.6.8-r4.ebuild
+2205062310 ./dev-python/raet/raet-0.6.8-r4.ebuild
 2204021510 ./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
@@ -12847,13 +12846,8 @@
 2107280239 ./dev-python/setproctitle/setproctitle-1.2.2.ebuild
 2205050610 ./dev-python/setproctitle/setproctitle-1.2.3.ebuild
 2205010512 ./dev-python/setuptools-git/setuptools-git-1.2-r2.ebuild
-2204201109 ./dev-python/setuptools/setuptools-60.5.0.ebuild
-2204201109 ./dev-python/setuptools/setuptools-60.9.2.ebuild
-2204201109 ./dev-python/setuptools/setuptools-61.3.0.ebuild
-2204201109 ./dev-python/setuptools/setuptools-61.3.1-r1.ebuild
-2204201109 ./dev-python/setuptools/setuptools-62.0.0.ebuild
-2204202009 ./dev-python/setuptools/setuptools-60.10.0.ebuild
-2205050840 ./dev-python/setuptools/setuptools-62.1.0.ebuild
+2205062310 ./dev-python/setuptools/setuptools-60.10.0.ebuild
+2205062310 ./dev-python/setuptools/setuptools-62.1.0.ebuild
 2202271539 ./dev-python/setuptools_scm/setuptools_scm-6.4.1.ebuild
 2204290540 ./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
@@ -12960,7 +12954,7 @@
 2203202209 ./dev-python/sqlalchemy/sqlalchemy-1.4.32.ebuild
 2204011640 ./dev-python/sqlalchemy/sqlalchemy-1.4.34.ebuild
 2205021210 ./dev-python/sqlalchemy/sqlalchemy-1.4.36.ebuild
-2205051610 ./dev-python/sqlalchemy/sqlalchemy-1.4.35.ebuild
+2205062310 ./dev-python/sqlalchemy/sqlalchemy-1.4.35.ebuild
 2110270109 ./dev-python/sqlitedict/sqlitedict-1.7.0.ebuild
 2203092340 ./dev-python/sqlitedict/sqlitedict-2.0.0.ebuild
 2109121040 ./dev-python/sqlparse/sqlparse-0.4.2.ebuild
@@ -13092,7 +13086,7 @@
 2202161009 ./dev-python/ubelt/ubelt-1.0.0.ebuild
 2202210209 ./dev-python/ubelt/ubelt-1.0.1.ebuild
 2202180039 ./dev-python/ujson/ujson-5.1.0.ebuild
-2205061740 ./dev-python/ujson/ujson-5.2.0-r1.ebuild
+2205062140 ./dev-python/ujson/ujson-5.2.0-r1.ebuild
 2112260340 ./dev-python/unasync/unasync-0.5.0.ebuild
 2108252139 ./dev-python/uncertainties/uncertainties-3.1.6.ebuild
 2204241440 ./dev-python/unicodecsv/unicodecsv-0.14.1-r2.ebuild
@@ -13150,9 +13144,7 @@
 2205010512 ./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
-2108201039 ./dev-python/watchdog/watchdog-1.0.2.ebuild
-2112122139 ./dev-python/watchdog/watchdog-2.1.6.ebuild
-2205010512 ./dev-python/watchdog/watchdog-2.1.7.ebuild
+2205062310 ./dev-python/watchdog/watchdog-2.1.7.ebuild
 2204252240 ./dev-python/watchgod/watchgod-0.8.1.ebuild
 2205010512 ./dev-python/watchgod/watchgod-0.8.2.ebuild
 2201101440 ./dev-python/wcmatch/wcmatch-8.3.ebuild
@@ -13175,7 +13167,7 @@
 2203181510 ./dev-python/werkzeug/werkzeug-2.0.3.ebuild
 2203311710 ./dev-python/werkzeug/werkzeug-2.1.0.ebuild
 2205010512 ./dev-python/werkzeug/werkzeug-2.1.2.ebuild
-2205051040 ./dev-python/werkzeug/werkzeug-2.1.1.ebuild
+2205062310 ./dev-python/werkzeug/werkzeug-2.1.1.ebuild
 2105102239 ./dev-python/whatever/whatever-0.6.ebuild
 2204291110 ./dev-python/wheel/wheel-0.37.1-r1.ebuild
 2106052209 ./dev-python/whichcraft/whichcraft-0.6.1.ebuild
@@ -13328,18 +13320,18 @@
 2203151940 ./dev-python/boolean-py/boolean-py-3.8.ebuild
 2205061110 ./dev-python/boolean-py/boolean-py-4.0.ebuild
 2203151940 ./dev-python/license-expression/license-expression-21.6.14.ebuild
-2204290540 ./dev-python/nspektr/nspektr-0.3.0.ebuild
+2205062310 ./dev-python/nspektr/nspektr-0.3.0.ebuild
 2204270110 ./dev-python/Arpeggio/Arpeggio-2.0.0.ebuild
 2203211209 ./dev-python/textX/textX-1.4.ebuild
 2203211209 ./dev-python/textX/textX-3.0.0.ebuild
 2204100539 ./dev-python/uri_template/uri_template-1.1.0.ebuild
 2205010512 ./dev-python/uri_template/uri_template-1.2.0.ebuild
-2205051040 ./dev-python/ephemeral-port-reserve/ephemeral-port-reserve-1.1.4.ebuild
-2204161210 ./dev-python/pytest-shell-utilities/pytest-shell-utilities-1.0.5.ebuild
-2204161210 ./dev-python/pytest-skip-markers/pytest-skip-markers-1.2.0.ebuild
-2204161210 ./dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2.ebuild
-2204261010 ./dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.2.0-r1.ebuild
-2205050840 ./dev-python/ini2toml/ini2toml-0.10.ebuild
+2205062310 ./dev-python/ephemeral-port-reserve/ephemeral-port-reserve-1.1.4.ebuild
+2205062310 ./dev-python/pytest-shell-utilities/pytest-shell-utilities-1.0.5.ebuild
+2205062310 ./dev-python/pytest-skip-markers/pytest-skip-markers-1.2.0.ebuild
+2205062310 ./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
+2205062310 ./dev-python/ini2toml/ini2toml-0.10.ebuild
 2204051709 ./dev-python/itunespy/itunespy-1.6-r1.ebuild
 2204041909 ./dev-python/pyDes/pyDes-2.0.1.ebuild
 2204041909 ./dev-python/simber/simber-0.2.4.ebuild
@@ -13354,7 +13346,7 @@
 2204050639 ./dev-python/python-ptrace/python-ptrace-9999.ebuild
 2204051639 ./dev-python/ffmpeg-python/ffmpeg-python-0.2.0.ebuild
 2205052310 ./dev-python/gpep517/gpep517-3.ebuild
-2205052310 ./dev-python/gpep517/gpep517-4.ebuild
+2205070010 ./dev-python/gpep517/gpep517-5.ebuild
 2204051639 ./dev-python/spotipy/spotipy-2.19.0.ebuild
 2204101339 ./dev-python/editables/editables-0.2.ebuild
 2205020110 ./dev-python/editables/editables-0.3.ebuild
@@ -13379,7 +13371,7 @@
 2205021410 ./dev-python/notebook_shim/notebook_shim-0.1.0.ebuild
 2205031140 ./dev-python/suds-community/suds-community-1.1.0.ebuild
 2205031740 ./dev-python/suds-community/suds-community-1.1.1.ebuild
-2205061640 ./dev-python/pytesseract/pytesseract-0.3.10.ebuild
+2205062210 ./dev-python/pytesseract/pytesseract-0.3.10.ebuild
 2204172140 ./dev-qt/assistant/assistant-5.15.3.ebuild
 2204172140 ./dev-qt/designer/designer-5.15.3.ebuild
 2204172140 ./dev-qt/linguist-tools/linguist-tools-5.15.3.ebuild
@@ -14781,6 +14773,7 @@
 2110231009 ./dev-ruby/ae/ae-1.8.2-r1.ebuild
 2204301240 ./dev-ruby/afm/afm-0.2.2-r1.ebuild
 2009160939 ./dev-ruby/airbrussh/airbrussh-1.4.0.ebuild
+2205070940 ./dev-ruby/airbrussh/airbrussh-1.4.0-r1.ebuild
 2111231009 ./dev-ruby/allison/allison-2.0.3-r4.ebuild
 2110271439 ./dev-ruby/amatch/amatch-0.4.0-r1.ebuild
 2107071009 ./dev-ruby/ammeter/ammeter-1.1.5.ebuild
@@ -14824,16 +14817,16 @@
 2111231439 ./dev-ruby/axiom-types/axiom-types-0.1.1-r1.ebuild
 2109250839 ./dev-ruby/backports/backports-3.20.2-r1.ebuild
 2108080909 ./dev-ruby/backports/backports-3.21.0.ebuild
-2202230909 ./dev-ruby/backports/backports-3.23.0.ebuild
+2205070940 ./dev-ruby/backports/backports-3.23.0.ebuild
 2111241610 ./dev-ruby/bacon/bacon-1.2.0-r3.ebuild
 2203201310 ./dev-ruby/bacon/bacon-1.2.0-r4.ebuild
 2008040709 ./dev-ruby/barby/barby-0.6.8.ebuild
-2110300839 ./dev-ruby/base32/base32-0.3.4-r1.ebuild
 2008260709 ./dev-ruby/base32/base32-0.3.4.ebuild
+2205070940 ./dev-ruby/base32/base32-0.3.4-r1.ebuild
 2111080609 ./dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.16-r1.ebuild
 2111130839 ./dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.16-r2.ebuild
 2106301009 ./dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.16.ebuild
-2203151009 ./dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.17.ebuild
+2205070940 ./dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.17.ebuild
 2203310910 ./dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.1.0-r1.ebuild
 2008230939 ./dev-ruby/best_in_place/best_in_place-3.1.1.ebuild
 2108080909 ./dev-ruby/bindata/bindata-2.4.10.ebuild
@@ -14868,25 +14861,24 @@
 2009151039 ./dev-ruby/bunny/bunny-2.17.0.ebuild
 2110072339 ./dev-ruby/bunny/bunny-2.19.0.ebuild
 2008221109 ./dev-ruby/c21e/c21e-1.2.1.ebuild
-2107181239 ./dev-ruby/c21e/c21e-2.0.0.ebuild
+2205070940 ./dev-ruby/c21e/c21e-2.0.0.ebuild
 2107180910 ./dev-ruby/capistrano/capistrano-2.15.5-r3.ebuild
 2107072109 ./dev-ruby/capistrano/capistrano-3.16.0.ebuild
+2205070940 ./dev-ruby/capistrano/capistrano-3.17.0.ebuild
 2109181109 ./dev-ruby/capybara/capybara-3.35.3.ebuild
-2203201310 ./dev-ruby/capybara/capybara-3.36.0.ebuild
+2205070940 ./dev-ruby/capybara/capybara-3.36.0.ebuild
 2107061109 ./dev-ruby/certificate_authority/certificate_authority-1.0.0.ebuild
 2107011009 ./dev-ruby/certified/certified-1.0.0.ebuild
-2110260809 ./dev-ruby/charlock_holmes/charlock_holmes-0.7.7-r1.ebuild
+2205070940 ./dev-ruby/charlock_holmes/charlock_holmes-0.7.7-r1.ebuild
 2204270740 ./dev-ruby/childlabor/childlabor-0.0.3-r2.ebuild
-2104060140 ./dev-ruby/childprocess/childprocess-3.0.0.ebuild
-2105040839 ./dev-ruby/childprocess/childprocess-4.0.0.ebuild
 2204182040 ./dev-ruby/childprocess/childprocess-4.1.0.ebuild
 2204171140 ./dev-ruby/chronic/chronic-0.10.2-r1.ebuild
 2204231309 ./dev-ruby/chunky_png/chunky_png-1.4.0.ebuild
 1905041439 ./dev-ruby/cinch/cinch-2.3.4.ebuild
 2007270539 ./dev-ruby/classifier-reborn/classifier-reborn-2.2.0.ebuild
 2008221109 ./dev-ruby/climate_control/climate_control-0.2.0.ebuild
+2205070940 ./dev-ruby/climate_control/climate_control-1.0.1.ebuild
 2204021210 ./dev-ruby/cliver/cliver-0.3.2-r1.ebuild
-2012090939 ./dev-ruby/cmdparse/cmdparse-3.0.7.ebuild
 2203191510 ./dev-ruby/cmdparse/cmdparse-3.0.7-r1.ebuild
 2104060140 ./dev-ruby/coderay/coderay-1.1.2.ebuild
 2108030109 ./dev-ruby/coderay/coderay-1.1.3-r1.ebuild
@@ -14895,28 +14887,27 @@
 2107071009 ./dev-ruby/coffee-rails/coffee-rails-5.0.0-r1.ebuild
 2203261740 ./dev-ruby/coffee-script-source/coffee-script-source-1.12.2-r1.ebuild
 2203261740 ./dev-ruby/coffee-script/coffee-script-2.4.1.ebuild
-2111241010 ./dev-ruby/color/color-1.8-r1.ebuild
-2111051109 ./dev-ruby/colorator/colorator-1.1.0-r1.ebuild
-2203181010 ./dev-ruby/colored/colored-1.2-r1.ebuild
-2002141039 ./dev-ruby/colored2/colored2-3.1.2.ebuild
-2107061109 ./dev-ruby/colorize/colorize-0.8.1-r1.ebuild
-2107061109 ./dev-ruby/columnize/columnize-0.9.0-r1.ebuild
+2205070940 ./dev-ruby/color/color-1.8-r1.ebuild
+2205070940 ./dev-ruby/colorator/colorator-1.1.0-r1.ebuild
+2205070940 ./dev-ruby/colored/colored-1.2-r1.ebuild
+2205070940 ./dev-ruby/colored2/colored2-3.1.2.ebuild
+2205070940 ./dev-ruby/colorize/colorize-0.8.1-r1.ebuild
+2205070940 ./dev-ruby/columnize/columnize-0.9.0-r1.ebuild
 2111221009 ./dev-ruby/combustion/combustion-1.3.4.ebuild
 2204150840 ./dev-ruby/combustion/combustion-1.3.5.ebuild
 2003141109 ./dev-ruby/commander/commander-4.5.2.ebuild
-2104100939 ./dev-ruby/commander/commander-4.6.0.ebuild
+2205070940 ./dev-ruby/commander/commander-4.6.0.ebuild
 2110281709 ./dev-ruby/concurrent-ruby/concurrent-ruby-1.1.9.ebuild
 2204261810 ./dev-ruby/concurrent-ruby/concurrent-ruby-1.1.10.ebuild
 2204261810 ./dev-ruby/connection_pool/connection_pool-2.2.5.ebuild
-2004122139 ./dev-ruby/contracts/contracts-0.16.0.ebuild
 2108141209 ./dev-ruby/contracts/contracts-0.16.1.ebuild
-2106200919 ./dev-ruby/contracts/contracts-0.17.ebuild
-2110271439 ./dev-ruby/coolio/coolio-1.7.1-r1.ebuild
-2110240909 ./dev-ruby/countdownlatch/countdownlatch-1.0.0-r2.ebuild
+2205070940 ./dev-ruby/contracts/contracts-0.17.ebuild
+2205070940 ./dev-ruby/coolio/coolio-1.7.1-r1.ebuild
+2205070940 ./dev-ruby/countdownlatch/countdownlatch-1.0.0-r2.ebuild
 2204270740 ./dev-ruby/crack/crack-0.4.4.ebuild
 2109080039 ./dev-ruby/crass/crass-1.0.6.ebuild
 2203161009 ./dev-ruby/crass/crass-1.0.6-r1.ebuild
-2101241009 ./dev-ruby/creole/creole-0.5.0-r1.ebuild
+2205070940 ./dev-ruby/creole/creole-0.5.0-r1.ebuild
 2101060939 ./dev-ruby/cri/cri-2.15.11.ebuild
 2203181010 ./dev-ruby/cri/cri-2.15.11-r1.ebuild
 2107311009 ./dev-ruby/css_parser/css_parser-1.10.0.ebuild
@@ -14925,9 +14916,10 @@
 2203220939 ./dev-ruby/csv/csv-3.2.2.ebuild
 2204091109 ./dev-ruby/csv/csv-3.2.3.ebuild
 2110271439 ./dev-ruby/curb/curb-0.9.11-r1.ebuild
+2205070940 ./dev-ruby/curb/curb-1.0.1.ebuild
 2110220439 ./dev-ruby/curses/curses-1.4.2.ebuild
 2201081509 ./dev-ruby/curses/curses-1.4.3.ebuild
-2202030939 ./dev-ruby/curses/curses-1.4.4.ebuild
+2205070940 ./dev-ruby/curses/curses-1.4.4.ebuild
 2201150940 ./dev-ruby/daemon_controller/daemon_controller-1.2.0-r2.ebuild
 2101062139 ./dev-ruby/daemons/daemons-1.3.1.ebuild
 2105050809 ./dev-ruby/daemons/daemons-1.4.0.ebuild
@@ -15192,7 +15184,7 @@
 2109220839 ./dev-ruby/marcel/marcel-1.0.2.ebuild
 2204261810 ./dev-ruby/maruku/maruku-0.7.3-r1.ebuild
 2111221009 ./dev-ruby/mash/mash-0.1.1-r3.ebuild
-2204021210 ./dev-ruby/matrix/matrix-0.4.2.ebuild
+2205070940 ./dev-ruby/matrix/matrix-0.4.2.ebuild
 2111210809 ./dev-ruby/maxitest/maxitest-3.7.0.ebuild
 2008091309 ./dev-ruby/mecab-ruby/mecab-ruby-0.996-r1.ebuild
 2205011210 ./dev-ruby/mecab-ruby/mecab-ruby-0.996-r2.ebuild
@@ -16362,8 +16354,8 @@
 2112201210 ./dev-util/ebuildtester/ebuildtester-0.1.27.ebuild
 2112201210 ./dev-util/ebuildtester/ebuildtester-0.1.29.ebuild
 2203212039 ./dev-util/ebuildtester/ebuildtester-0.1.30.ebuild
-2012142309 ./dev-util/edb-debugger/edb-debugger-1.3.0.ebuild
 2001191639 ./dev-util/edb-debugger/edb-debugger-9999.ebuild
+2205070740 ./dev-util/edb-debugger/edb-debugger-1.3.0.ebuild
 2201212139 ./dev-util/edi/edi-0.8.0-r1.ebuild
 2203291040 ./dev-util/edi/edi-0.8.0-r2.ebuild
 2104130239 ./dev-util/editorconfig-geany/editorconfig-geany-0.2.ebuild
@@ -16535,14 +16527,13 @@
 2103152309 ./dev-util/memprof/memprof-0.6.2-r1.ebuild
 2204291110 ./dev-util/meson-format-array/meson-format-array-0.ebuild
 2204251910 ./dev-util/meson/meson-0.60.3.ebuild
-2204291110 ./dev-util/meson/meson-0.61.4-r2.ebuild
 2204260511 ./dev-util/meson/meson-0.62.1.ebuild
 2204260511 ./dev-util/meson/meson-9999.ebuild
+2205062310 ./dev-util/meson/meson-0.61.4-r2.ebuild
 2202271709 ./dev-util/min-cscope/min-cscope-16.1.0-r1.ebuild
 2204250040 ./dev-util/mingw64-runtime/mingw64-runtime-10.0.0.ebuild
 2204250040 ./dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r2.ebuild
 2204250040 ./dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r1.ebuild
-1708131410 ./dev-util/nemiver/nemiver-0.9.6.ebuild
 2108120640 ./dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9.ebuild
 2110111209 ./dev-util/ninja/ninja-9999.ebuild
 2204291110 ./dev-util/ninja/ninja-1.10.2-r1.ebuild
@@ -16951,12 +16942,11 @@
 1912221609 ./dev-vcs/rcsi/rcsi-0.5.ebuild
 2110020709 ./dev-vcs/repo/repo-2.15.ebuild
 2202040739 ./dev-vcs/repo/repo-2.17.ebuild
-2202040739 ./dev-vcs/repo/repo-2.21.ebuild
+2205070310 ./dev-vcs/repo/repo-2.21.ebuild
 2106020039 ./dev-vcs/reposurgeon/reposurgeon-4.27.ebuild
 2202152039 ./dev-vcs/rsvndump/rsvndump-0.6.1.ebuild
 2203110039 ./dev-vcs/rsvndump/rsvndump-0.6-r1.ebuild
-2201301339 ./dev-vcs/stgit/stgit-1.4.ebuild
-2205061740 ./dev-vcs/stgit/stgit-1.5.ebuild
+2205070310 ./dev-vcs/stgit/stgit-1.5.ebuild
 2205010512 ./dev-vcs/subversion/subversion-1.14.1.ebuild
 1911100639 ./dev-vcs/svn2cl/svn2cl-0.12.ebuild
 2103040109 ./dev-vcs/svn2cl/svn2cl-0.14.ebuild
@@ -17493,8 +17483,8 @@
 2112070940 ./games-misc/fortune-mod/fortune-mod-3.6.1-r1.ebuild
 2112161109 ./games-misc/fortune-mod/fortune-mod-3.10.0.ebuild
 2201242239 ./games-misc/fortune-mod/fortune-mod-1.99.1-r3.ebuild
-2205050840 ./games-misc/fortune-mod/fortune-mod-3.12.0.ebuild
 2205051010 ./games-misc/fortune-mod/fortune-mod-3.14.0.ebuild
+2205062310 ./games-misc/fortune-mod/fortune-mod-3.12.0.ebuild
 2104212209 ./games-misc/funny-manpages/funny-manpages-2.3.ebuild
 2104041339 ./games-misc/gBhed/gBhed-0.17-r1.ebuild
 2006141709 ./games-misc/gtklife/gtklife-5.2.ebuild
@@ -17926,10 +17916,11 @@
 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
 2112310709 ./gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
 2202080810 ./gnome-base/gnome/gnome-40.0.ebuild
-2203160010 ./gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-41.0.ebuild
 2203202309 ./gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-42.0.ebuild
+2205062310 ./gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-41.0.ebuild
 2201222209 ./gnome-base/gvfs/gvfs-1.48.1-r1.ebuild
 2203260009 ./gnome-base/gvfs/gvfs-1.50.0.ebuild
 2204250210 ./gnome-base/gvfs/gvfs-1.50.1.ebuild
@@ -17971,7 +17962,7 @@
 2204230810 ./gnome-extra/evolution-data-server/evolution-data-server-3.44.1.ebuild
 2203081240 ./gnome-extra/evolution-ews/evolution-ews-3.42.4.ebuild
 2203270310 ./gnome-extra/evolution-ews/evolution-ews-3.44.0.ebuild
-2204230810 ./gnome-extra/evolution-ews/evolution-ews-3.44.1.ebuild
+2205070610 ./gnome-extra/evolution-ews/evolution-ews-3.44.1.ebuild
 2105041009 ./gnome-extra/filemanager-actions/filemanager-actions-3.4.ebuild
 2105090839 ./gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild
 2203081240 ./gnome-extra/gnome-boxes/gnome-boxes-41.3.ebuild
@@ -18025,6 +18016,7 @@
 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
 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
@@ -19158,6 +19150,7 @@
 2204071739 ./mail-filter/postsrsd/postsrsd-1.11-r1.ebuild
 2107232139 ./mail-filter/procmail/procmail-3.22-r15.ebuild
 2203040040 ./mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild
+2205071040 ./mail-filter/pyzor/pyzor-1.0.0_p20211223.ebuild
 2101061709 ./mail-filter/razor/razor-2.85-r3.ebuild
 2104192239 ./mail-filter/rblcheck/rblcheck-1.5-r2.ebuild
 2204121140 ./mail-filter/rspamd/rspamd-3.2.ebuild
@@ -19381,7 +19374,7 @@
 2112081340 ./media-fonts/lfpfonts-fix/lfpfonts-fix-0.83-r2.ebuild
 2112081340 ./media-fonts/lfpfonts-var/lfpfonts-var-0.84.ebuild
 2201281310 ./media-fonts/liberation-fonts/liberation-fonts-2.1.2.ebuild
-2201281310 ./media-fonts/liberation-fonts/liberation-fonts-2.1.3.ebuild
+2205070740 ./media-fonts/liberation-fonts/liberation-fonts-2.1.3.ebuild
 2112081340 ./media-fonts/libertine/libertine-5.3.0.20120702-r3.ebuild
 2112081340 ./media-fonts/lklug/lklug-0.6-r1.ebuild
 2112081340 ./media-fonts/lohit-assamese/lohit-assamese-2.91.5.ebuild
@@ -19526,6 +19519,7 @@
 2203141339 ./media-gfx/cairosvg/cairosvg-2.5.2.ebuild
 2011041109 ./media-gfx/cellwriter/cellwriter-1.3.6.ebuild
 2205050840 ./media-gfx/chafa/chafa-1.10.2.ebuild
+2205062240 ./media-gfx/chafa/chafa-1.10.3.ebuild
 2006071209 ./media-gfx/clockphoto/clockphoto-1.2.ebuild
 2107170239 ./media-gfx/colorhug-client/colorhug-client-0.2.8.ebuild
 2107160109 ./media-gfx/converseen/converseen-0.9.9.0.ebuild
@@ -19638,7 +19632,7 @@
 2205040340 ./media-gfx/graphicsmagick/graphicsmagick-1.3.38.ebuild
 2112231140 ./media-gfx/graphite2/graphite2-1.3.14-r1.ebuild
 2112291909 ./media-gfx/graphite2/graphite2-1.3.14_p20210810.ebuild
-2201292209 ./media-gfx/graphite2/graphite2-1.3.14_p20210810-r1.ebuild
+2205070740 ./media-gfx/graphite2/graphite2-1.3.14_p20210810-r1.ebuild
 2204122110 ./media-gfx/graphviz/graphviz-2.49.0-r1.ebuild
 2204122110 ./media-gfx/graphviz/graphviz-2.50.0.ebuild
 2012231444 ./media-gfx/grub-splashes/grub-splashes-20091109.ebuild
@@ -19698,6 +19692,7 @@
 2109302039 ./media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild
 2111151710 ./media-gfx/krita/krita-4.4.8-r1.ebuild
 2202281039 ./media-gfx/krita/krita-5.0.2.ebuild
+2205070840 ./media-gfx/krita/krita-5.0.6-r1.ebuild
 2107141739 ./media-gfx/kuickshow/kuickshow-0.10.2.ebuild
 2105161410 ./media-gfx/kxstitch/kxstitch-2.2.0.ebuild
 2201070209 ./media-gfx/libimagequant/libimagequant-2.15.1.ebuild
@@ -19932,9 +19927,9 @@
 2202260339 ./media-libs/flac/flac-1.3.4.ebuild
 2201021609 ./media-libs/flickcurl/flickcurl-1.26.ebuild
 1908061309 ./media-libs/fluidsynth-dssi/fluidsynth-dssi-1.0.0-r1.ebuild
-2204020740 ./media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
 2204222110 ./media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
 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
 2202120109 ./media-libs/freeglut/freeglut-3.2.2.ebuild
@@ -19942,7 +19937,7 @@
 2203010309 ./media-libs/freeimage/freeimage-3.18.0-r6.ebuild
 2201080039 ./media-libs/freetype/freetype-9999.ebuild
 2204261710 ./media-libs/freetype/freetype-2.12.0-r1.ebuild
-2205012140 ./media-libs/freetype/freetype-2.12.1.ebuild
+2205070740 ./media-libs/freetype/freetype-2.12.1.ebuild
 2003250139 ./media-libs/freeverb3/freeverb3-3.2.1-r2.ebuild
 2203140209 ./media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
 2108211209 ./media-libs/game-music-emu/game-music-emu-0.6.3.ebuild
@@ -20008,8 +20003,8 @@
 2203250639 ./media-libs/harfbuzz/harfbuzz-4.1.0.ebuild
 2203250639 ./media-libs/harfbuzz/harfbuzz-9999.ebuild
 2203301810 ./media-libs/harfbuzz/harfbuzz-4.2.0.ebuild
-2204241210 ./media-libs/harfbuzz/harfbuzz-4.2.1.ebuild
 2205020310 ./media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild
+2205070740 ./media-libs/harfbuzz/harfbuzz-4.2.1.ebuild
 1911150539 ./media-libs/icc-profiles-basiccolor-printing2009/icc-profiles-basiccolor-printing2009-1.2.0.ebuild
 1911150609 ./media-libs/icc-profiles-openicc/icc-profiles-openicc-1.3.1.ebuild
 2011261339 ./media-libs/icclib/icclib-2.14.ebuild
@@ -20139,6 +20134,7 @@
 2109191139 ./media-libs/libheif/libheif-9999.ebuild
 1907140209 ./media-libs/libicns/libicns-0.8.1-r1.ebuild
 2110030209 ./media-libs/libid3tag/libid3tag-0.16.1-r1.ebuild
+2205071040 ./media-libs/libid3tag/libid3tag-0.16.2.ebuild
 2108181309 ./media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild
 2002222009 ./media-libs/libifp/libifp-1.0.0.2-r1.ebuild
 2108241740 ./media-libs/libilbc/libilbc-3.0.4.ebuild
@@ -20222,7 +20218,7 @@
 2203170240 ./media-libs/libplacebo/libplacebo-9999.ebuild
 2003261841 ./media-libs/libpng-compat/libpng-compat-1.2.59.ebuild
 2111221339 ./media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
-2104141009 ./media-libs/libpng/libpng-1.6.37-r2.ebuild
+2205070740 ./media-libs/libpng/libpng-1.6.37-r2.ebuild
 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
@@ -20287,13 +20283,10 @@
 2112061809 ./media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild
 2205012040 ./media-libs/lv2/lv2-1.18.2.ebuild
 2009231339 ./media-libs/lvtk/lvtk-1.2.0-r1.ebuild
-2203100110 ./media-libs/mesa/mesa-21.3.7.ebuild
-2203100110 ./media-libs/mesa/mesa-22.0.0.ebuild
-2203281740 ./media-libs/mesa/mesa-21.3.8.ebuild
-2203300210 ./media-libs/mesa/mesa-22.0.1.ebuild
-2204282210 ./media-libs/mesa/mesa-22.1.0_rc3.ebuild
-2204300340 ./media-libs/mesa/mesa-22.0.2.ebuild
 2205031840 ./media-libs/mesa/mesa-9999.ebuild
+2205062010 ./media-libs/mesa/mesa-21.3.8.ebuild
+2205062010 ./media-libs/mesa/mesa-22.0.3.ebuild
+2205062010 ./media-libs/mesa/mesa-22.1.0_rc4.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
@@ -20318,7 +20311,7 @@
 2111030210 ./media-libs/opencolorio/opencolorio-2.0.1-r2.ebuild
 2112170609 ./media-libs/opencolorio/opencolorio-2.0.3.ebuild
 2201020339 ./media-libs/opencolorio/opencolorio-2.1.1-r2.ebuild
-2203010309 ./media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild
+2205071040 ./media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild
 2108101209 ./media-libs/opencore-amr/opencore-amr-0.1.5-r1.ebuild
 2203200310 ./media-libs/openctm/openctm-1.0.3-r1.ebuild
 2204220009 ./media-libs/opencv/opencv-4.5.5-r1.ebuild
@@ -20332,6 +20325,7 @@
 2202120709 ./media-libs/openimageio/openimageio-2.2.19.0.ebuild
 2203010309 ./media-libs/openimageio/openimageio-2.3.12.0-r3.ebuild
 2203020540 ./media-libs/openimageio/openimageio-2.3.13.0.ebuild
+2205071040 ./media-libs/openimageio/openimageio-2.3.15.0.ebuild
 2109201739 ./media-libs/openjpeg/openjpeg-2.4.0.ebuild
 2202030539 ./media-libs/openjpeg/openjpeg-2.4.0-r1.ebuild
 2204070709 ./media-libs/openjpeg/openjpeg-2.4.0-r2.ebuild
@@ -21219,7 +21213,9 @@
 2204070909 ./media-sound/abcmidi/abcmidi-2022.04.06.ebuild
 2204241440 ./media-sound/abcmidi/abcmidi-2022.03.20.ebuild
 2204290940 ./media-sound/abcmidi/abcmidi-2022.04.28.ebuild
+2205071040 ./media-sound/abcmidi/abcmidi-2022.05.05.ebuild
 2203100240 ./media-sound/aeolus/aeolus-0.9.9.ebuild
+2205071040 ./media-sound/aeolus/aeolus-0.10.1.ebuild
 2203202209 ./media-sound/alac_decoder/alac_decoder-0.2.0-r2.ebuild
 2106052339 ./media-sound/alsa-tools/alsa-tools-1.2.2-r1.ebuild
 2204252340 ./media-sound/alsa-tools/alsa-tools-1.2.5.ebuild
@@ -21329,6 +21325,7 @@
 2004032340 ./media-sound/fmit/fmit-1.0.15-r3.ebuild
 2011141839 ./media-sound/fmtools/fmtools-2.0.7.ebuild
 2108051739 ./media-sound/frescobaldi/frescobaldi-3.1.3.ebuild
+2205071040 ./media-sound/frescobaldi/frescobaldi-3.2.ebuild
 2107041709 ./media-sound/gbsplay/gbsplay-0.0.91-r2.ebuild
 2106141009 ./media-sound/gigedit/gigedit-1.2.0-r1.ebuild
 2106141009 ./media-sound/gigedit/gigedit-9999.ebuild
@@ -21565,6 +21562,7 @@
 2203231209 ./media-sound/rplay/rplay-3.3.2-r4.ebuild
 1910180209 ./media-sound/saydate/saydate-0.3.0.ebuild
 2202262209 ./media-sound/schismtracker/schismtracker-20220125.ebuild
+2205071110 ./media-sound/schismtracker/schismtracker-20220506.ebuild
 2008191339 ./media-sound/scmpc/scmpc-0.4.1.ebuild
 2201121140 ./media-sound/scream/scream-3.9.ebuild
 2201121140 ./media-sound/scream/scream-9999.ebuild
@@ -22342,7 +22340,6 @@
 2204061239 ./net-analyzer/zabbix/zabbix-5.0.22.ebuild
 2204061210 ./net-analyzer/zabbix/zabbix-5.4.10-r2.ebuild
 2204061239 ./net-analyzer/zabbix/zabbix-5.4.12.ebuild
-2204061210 ./net-analyzer/zabbix/zabbix-6.0.2-r1.ebuild
 2204061239 ./net-analyzer/zabbix/zabbix-6.0.3.ebuild
 2203230439 ./net-analyzer/zmap/zmap-2.1.1-r4.ebuild
 2203230439 ./net-analyzer/zmap/zmap-9999.ebuild
@@ -22358,7 +22355,7 @@
 2203230410 ./net-dialup/freeradius/freeradius-3.0.20-r5.ebuild
 2203230410 ./net-dialup/freeradius/freeradius-3.0.21-r5.ebuild
 2203230410 ./net-dialup/freeradius/freeradius-3.0.22-r4.ebuild
-2203230410 ./net-dialup/freeradius/freeradius-3.0.25-r2.ebuild
+2205062110 ./net-dialup/freeradius/freeradius-3.0.25-r2.ebuild
 2112142339 ./net-dialup/isdn-firmware/isdn-firmware-2011.8.29.8.37.ebuild
 2101021809 ./net-dialup/kpnadsl4linux/kpnadsl4linux-1.11.ebuild
 2111020109 ./net-dialup/linux-atm/linux-atm-2.5.2-r1.ebuild
@@ -22634,7 +22631,7 @@
 2111020109 ./net-im/sendxmpp/sendxmpp-1.24.ebuild
 2108161009 ./net-im/signal-cli-bin/signal-cli-bin-0.8.5.ebuild
 2112171639 ./net-im/signal-cli-bin/signal-cli-bin-0.9.2.ebuild
-2204291140 ./net-im/signal-desktop-bin/signal-desktop-bin-5.41.0.ebuild
+2205070840 ./net-im/signal-desktop-bin/signal-desktop-bin-5.42.0.ebuild
 2102261739 ./net-im/skype-dbus-mock/skype-dbus-mock-0_pre20181011.ebuild
 2202021239 ./net-im/skypeforlinux/skypeforlinux-8.79.0.95.ebuild
 2202021239 ./net-im/skypeforlinux/skypeforlinux-8.80.0.143.ebuild
@@ -23367,8 +23364,8 @@
 2104161439 ./net-misc/geoipupdate/geoipupdate-4.3.0.ebuild
 2203202339 ./net-misc/geoipupdate/geoipupdate-4.8.0.ebuild
 2107210039 ./net-misc/geomyidae/geomyidae-0.34-r1.ebuild
-2203181710 ./net-misc/gerbera/gerbera-1.10.0.ebuild
 2203181710 ./net-misc/gerbera/gerbera-9999.ebuild
+2205070840 ./net-misc/gerbera/gerbera-1.11.0.ebuild
 2006111139 ./net-misc/getdate/getdate-1.2-r2.ebuild
 2202080810 ./net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.ebuild
 2201270640 ./net-misc/gnome-remote-desktop/gnome-remote-desktop-41.2.ebuild
@@ -23956,7 +23953,7 @@
 2012042139 ./net-proxy/3proxy/3proxy-0.9.0.ebuild
 2104192239 ./net-proxy/adzapper/adzapper-20110915-r2.ebuild
 2104172239 ./net-proxy/cntlm/cntlm-0.93_beta5-r3.ebuild
-2201061240 ./net-proxy/dante/dante-1.4.1-r6.ebuild
+2205070740 ./net-proxy/dante/dante-1.4.1-r6.ebuild
 1902161239 ./net-proxy/dnsproxy/dnsproxy-1.17.ebuild
 2203161339 ./net-proxy/haproxy-dataplaneapi/haproxy-dataplaneapi-2.5.1.ebuild
 2204061709 ./net-proxy/haproxy/haproxy-2.0.25.ebuild
@@ -24080,8 +24077,8 @@
 2204221309 ./net-vpn/tailscale/tailscale-1.22.2.ebuild
 2205051340 ./net-vpn/tinc/tinc-1.0.36.ebuild
 2205051340 ./net-vpn/tinc/tinc-1.1_pre18.ebuild
-2204182210 ./net-vpn/tor/tor-0.4.6.10.ebuild
-2205060410 ./net-vpn/tor/tor-0.4.7.7.ebuild
+2205071040 ./net-vpn/tor/tor-0.4.6.10.ebuild
+2205071040 ./net-vpn/tor/tor-0.4.7.7.ebuild
 2110170109 ./net-vpn/vpnc-scripts/vpnc-scripts-20210402-r1.ebuild
 2110102239 ./net-vpn/vpnc-scripts/vpnc-scripts-99999999.ebuild
 2107250209 ./net-vpn/vpnc/vpnc-0.5.3_p550-r2.ebuild
@@ -26772,8 +26769,8 @@
 2203270439 ./sys-apps/hwloc/hwloc-2.6.0.ebuild
 2203270439 ./sys-apps/hwloc/hwloc-2.7.1-r1.ebuild
 2101310343 ./sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild
-2202012209 ./sys-apps/i2c-tools/i2c-tools-4.3.ebuild
-2204182340 ./sys-apps/i2c-tools/i2c-tools-4.2.ebuild
+2205071040 ./sys-apps/i2c-tools/i2c-tools-4.2.ebuild
+2205071040 ./sys-apps/i2c-tools/i2c-tools-4.3.ebuild
 2105301709 ./sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.8-r1.ebuild
 2105301709 ./sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-99999.ebuild
 2202100210 ./sys-apps/idle3-tools/idle3-tools-0.9.3_pre20120123-r2.ebuild
@@ -27009,7 +27006,7 @@
 2203280310 ./sys-apps/systemd/systemd-249.11.ebuild
 2204300340 ./sys-apps/systemd/systemd-250.4-r2.ebuild
 2204300340 ./sys-apps/systemd/systemd-250.5-r1.ebuild
-2205060512 ./sys-apps/systemd/systemd-9999.ebuild
+2205062140 ./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
@@ -27057,6 +27054,7 @@
 2201260040 ./sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.12.1.ebuild
 2204051939 ./sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.14.2.ebuild
 2204280310 ./sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.14.3.ebuild
+2205070840 ./sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.14.4.ebuild
 2106302109 ./sys-apps/xinetd/xinetd-2.3.15.4.ebuild
 2012231444 ./sys-apps/xmbmon/xmbmon-2.0.5-r1.ebuild
 2108131009 ./sys-apps/yarn/yarn-1.22.10.ebuild
@@ -27547,11 +27545,10 @@
 2203180610 ./sys-devel/gcc/gcc-9.4.1_p20220317.ebuild
 2204011010 ./sys-devel/gcc/gcc-10.3.1_p20211126.ebuild
 2204212339 ./sys-devel/gcc/gcc-11.3.0.ebuild
-2204211539 ./sys-devel/gcc/gcc-11.3.1_pre9999.ebuild
-2204282310 ./sys-devel/gcc/gcc-12.0.0_pre9999.ebuild
 2204282310 ./sys-devel/gcc/gcc-13.0.0_pre9999.ebuild
-2204292140 ./sys-devel/gcc/gcc-12.0.1_pre20220429.ebuild
-2205020740 ./sys-devel/gcc/gcc-12.0.1_pre20220430.ebuild
+2205070540 ./sys-devel/gcc/gcc-11.3.1_pre9999.ebuild
+2205070540 ./sys-devel/gcc/gcc-12.1.0.ebuild
+2205070540 ./sys-devel/gcc/gcc-12.1.1_pre9999.ebuild
 2104161439 ./sys-devel/gdb-apple/gdb-apple-1752.ebuild
 2204172140 ./sys-devel/gdb/gdb-11.2.ebuild
 2205020040 ./sys-devel/gdb/gdb-9999.ebuild
@@ -27876,7 +27873,7 @@
 2112262240 ./sys-fs/xfsprogs/xfsprogs-5.14.2.ebuild
 2204072310 ./sys-fs/xfsprogs/xfsprogs-5.15.0.ebuild
 2205060310 ./sys-fs/xfsprogs/xfsprogs-5.16.0.ebuild
-2104131409 ./sys-fs/xwmfs/xwmfs-0.90.ebuild
+2205070810 ./sys-fs/xwmfs/xwmfs-0.91.ebuild
 2003221409 ./sys-fs/yaffs2utils/yaffs2utils-0.2.9.ebuild
 2109132339 ./sys-fs/zerofree/zerofree-1.1.1-r1.ebuild
 2204281640 ./sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r1.ebuild
@@ -28048,7 +28045,7 @@
 2201062240 ./sys-libs/binutils-libs/binutils-libs-2.36.1-r2.ebuild
 2203181010 ./sys-libs/binutils-libs/binutils-libs-2.37_p1-r2.ebuild
 2204101410 ./sys-libs/binutils-libs/binutils-libs-2.38-r1.ebuild
-2204162140 ./sys-libs/binutils-libs/binutils-libs-2.38-r2.ebuild
+2205070740 ./sys-libs/binutils-libs/binutils-libs-2.38-r2.ebuild
 2102050539 ./sys-libs/blocksruntime/blocksruntime-0_pre20171027-r1.ebuild
 2201040239 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.1.ebuild
 2204212010 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.ebuild
@@ -28128,7 +28125,7 @@
 2204301040 ./sys-libs/libcxxabi/libcxxabi-14.0.3.ebuild
 2108171309 ./sys-libs/libfaketime/libfaketime-0.9.9.ebuild
 2111210639 ./sys-libs/libfaketime/libfaketime-0.9.6-r4.ebuild
-2204141140 ./sys-libs/libhugetlbfs/libhugetlbfs-2.23.ebuild
+2205071040 ./sys-libs/libhugetlbfs/libhugetlbfs-2.23.ebuild
 2104180939 ./sys-libs/libhx/libhx-3.24-r1.ebuild
 2104180939 ./sys-libs/libhx/libhx-3.25.ebuild
 2009191539 ./sys-libs/libieee1284/libieee1284-0.2.11-r8.ebuild
@@ -28170,7 +28167,7 @@
 2108050209 ./sys-libs/libvpd/libvpd-2.2.8-r1.ebuild
 2201061410 ./sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild
 2202252209 ./sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
-2204290540 ./sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild
+2205070810 ./sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild
 2110041739 ./sys-libs/llvm-libunwind/llvm-libunwind-12.0.1.ebuild
 2204212010 ./sys-libs/llvm-libunwind/llvm-libunwind-13.0.1.ebuild
 2204260710 ./sys-libs/llvm-libunwind/llvm-libunwind-14.0.1.ebuild
@@ -28495,7 +28492,7 @@
 2204290540 ./virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.76.0-r2.ebuild
 2204290540 ./virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.450.0.ebuild
 2204171710 ./virtual/perl-IO-Compress/perl-IO-Compress-2.102.0-r1.ebuild
-2204222110 ./virtual/perl-IO-Compress/perl-IO-Compress-2.103.0-r1.ebuild
+2205070740 ./virtual/perl-IO-Compress/perl-IO-Compress-2.103.0-r1.ebuild
 2204290540 ./virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.410.0.ebuild
 2204290540 ./virtual/perl-IO-Zlib/perl-IO-Zlib-1.110.0.ebuild
 2204290540 ./virtual/perl-IO/perl-IO-1.460.0.ebuild
@@ -28662,9 +28659,8 @@
 2205031110 ./www-apps/drupal/drupal-8.9.20.ebuild
 2205031110 ./www-apps/drupal/drupal-9.1.15.ebuild
 2205031110 ./www-apps/drupal/drupal-9.2.18.ebuild
-2203160040 ./www-apps/element/element-1.10.7.ebuild
-2203282310 ./www-apps/element/element-1.10.8.ebuild
 2204212041 ./www-apps/element/element-1.10.10.ebuild
+2205062340 ./www-apps/element/element-1.10.11.ebuild
 2205011940 ./www-apps/gitea/gitea-1.16.6.ebuild
 2205020910 ./www-apps/gitea/gitea-1.16.5.ebuild
 2205050240 ./www-apps/gitea/gitea-1.16.6-r1.ebuild
@@ -28774,10 +28770,11 @@
 2202070940 ./www-apps/selfoss/selfoss-2.18-r2.ebuild
 2112290039 ./www-apps/icingaweb2-module-incubator/icingaweb2-module-incubator-0.11.0.ebuild
 2203191610 ./www-apps/sfpg/sfpg-4.9.0.ebuild
-2204141440 ./www-client/chromium/chromium-101.0.4951.34.ebuild
-2204131610 ./www-client/chromium/chromium-102.0.4997.0.ebuild
+2205062240 ./www-apps/miniflux/miniflux-2.0.36.ebuild
 2204162310 ./www-client/chromium/chromium-100.0.4896.127.ebuild
-2205060410 ./www-client/chromium/chromium-101.0.4951.54.ebuild
+2205062040 ./www-client/chromium/chromium-101.0.4951.54.ebuild
+2205062140 ./www-client/chromium/chromium-102.0.5005.40.ebuild
+2205062140 ./www-client/chromium/chromium-103.0.5042.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
@@ -28814,9 +28811,9 @@
 2205032040 ./www-client/microsoft-edge-beta/microsoft-edge-beta-101.0.1210.26.ebuild
 2205032040 ./www-client/microsoft-edge-beta/microsoft-edge-beta-101.0.1210.31.ebuild
 2205061310 ./www-client/microsoft-edge-beta/microsoft-edge-beta-101.0.1210.39.ebuild
-2204152240 ./www-client/microsoft-edge-dev/microsoft-edge-dev-102.0.1224.0.ebuild
 2205032040 ./www-client/microsoft-edge-dev/microsoft-edge-dev-102.0.1227.0.ebuild
 2205032040 ./www-client/microsoft-edge-dev/microsoft-edge-dev-102.0.1235.1.ebuild
+2205062210 ./www-client/microsoft-edge-dev/microsoft-edge-dev-102.0.1245.3.ebuild
 2205061310 ./www-client/microsoft-edge/microsoft-edge-101.0.1210.39.ebuild
 2107180040 ./www-client/netrik/netrik-1.16.1-r3.ebuild
 2203222209 ./www-client/netsurf/netsurf-3.10-r6.ebuild
@@ -28851,7 +28848,7 @@
 2107170109 ./www-client/w3m/w3m-0.5.3_p20210102.ebuild
 2202211709 ./www-client/w3m/w3m-0.5.3_p20220216.ebuild
 2203260340 ./www-client/w3mmee/w3mmee-0.3.2_p24-r12.ebuild
-2204151710 ./www-client/chromium-bin/chromium-bin-100.0.4896.127.ebuild
+2205062210 ./www-client/chromium-bin/chromium-bin-101.0.4951.54.ebuild
 2104161439 ./www-misc/awstats/awstats-7.8-r1.ebuild
 2002230040 ./www-misc/bookmarksync/bookmarksync-0.3.4-r3.ebuild
 2109081440 ./www-misc/buku/buku-4.6-r1.ebuild
@@ -29121,8 +29118,8 @@
 1910111911 ./x11-libs/agg/agg-2.5-r3.ebuild
 2012162341 ./x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.34.ebuild
 2105101009 ./x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.20.ebuild
-2201022110 ./x11-libs/cairo/cairo-1.16.0-r5.ebuild
-2202260639 ./x11-libs/cairo/cairo-9999.ebuild
+2205070740 ./x11-libs/cairo/cairo-1.16.0-r5.ebuild
+2205070740 ./x11-libs/cairo/cairo-9999.ebuild
 2108241539 ./x11-libs/colord-gtk/colord-gtk-0.2.0.ebuild
 2203081540 ./x11-libs/colord-gtk/colord-gtk-0.3.0.ebuild
 2112210710 ./x11-libs/dnd/dnd-1.1-r3.ebuild
@@ -29258,8 +29255,8 @@
 2203181810 ./x11-libs/pango/pango-1.50.4.ebuild
 2203200440 ./x11-libs/pango/pango-1.50.6.ebuild
 2204261740 ./x11-libs/pango/pango-1.50.7.ebuild
-2111070539 ./x11-libs/pixman/pixman-0.40.0.ebuild
-2111070539 ./x11-libs/pixman/pixman-9999.ebuild
+2205070740 ./x11-libs/pixman/pixman-0.40.0.ebuild
+2205070740 ./x11-libs/pixman/pixman-9999.ebuild
 2108031409 ./x11-libs/qscintilla/qscintilla-2.11.6.ebuild
 2110190739 ./x11-libs/qscintilla/qscintilla-2.13.1.ebuild
 2107261109 ./x11-libs/qtermwidget/qtermwidget-0.17.0.ebuild
@@ -30158,6 +30155,7 @@
 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
+2205070610 ./x11-wm/mutter/mutter-42.1.ebuild
 2012152209 ./x11-wm/notion/notion-3_p2015061300-r100.ebuild
 2012152209 ./x11-wm/notion/notion-9999.ebuild
 2202020609 ./x11-wm/openbox/openbox-3.6.1-r3.ebuild
@@ -30894,7 +30892,6 @@
 2204242010 metadata/md5-cache/acct-group/ziproxy-0
 2204242010 metadata/md5-cache/acct-group/znc-0-r1
 2204242010 metadata/md5-cache/acct-group/zookeeper-0
-2204271910 metadata/md5-cache/acct-user/Manifest.gz
 2204242010 metadata/md5-cache/acct-user/abrt-0-r1
 2204242010 metadata/md5-cache/acct-user/aerospike-amc-0
 2204242010 metadata/md5-cache/acct-user/airdcppd-0-r1
@@ -31316,6 +31313,8 @@
 2204242010 metadata/md5-cache/acct-user/ziproxy-0
 2204242010 metadata/md5-cache/acct-user/znc-0-r1
 2204242010 metadata/md5-cache/acct-user/zookeeper-0
+2205062240 metadata/md5-cache/acct-user/Manifest.gz
+2205062240 metadata/md5-cache/acct-user/miniflux-0
 2104180939 metadata/md5-cache/app-accessibility/mbrola-3.0.1h-r6
 2002230040 metadata/md5-cache/app-accessibility/sound-icons-0.1
 2203070710 metadata/md5-cache/app-accessibility/mbrola-voices-0_pre20200331
@@ -31336,7 +31335,6 @@
 2205011048 metadata/md5-cache/app-accessibility/at-spi2-core-2.44.0
 2205011048 metadata/md5-cache/app-accessibility/at-spi2-core-2.44.1
 2205011048 metadata/md5-cache/app-accessibility/caribou-0.4.21-r4
-2205011048 metadata/md5-cache/app-accessibility/edbrowse-3.7.5.1-r3
 2204302241 metadata/md5-cache/app-accessibility/epos-2.5.37-r3
 2204302241 metadata/md5-cache/app-accessibility/espeak-ng-1.50-r3
 2204302241 metadata/md5-cache/app-accessibility/espeak-ng-1.51
@@ -31351,13 +31349,14 @@
 2205011048 metadata/md5-cache/app-accessibility/speech-dispatcher-0.11.1
 2205011048 metadata/md5-cache/app-accessibility/speech-dispatcher-0.9.1
 2204302241 metadata/md5-cache/app-accessibility/yasr-0.6.9-r1
-2205022240 metadata/md5-cache/app-accessibility/Manifest.gz
 2205022240 metadata/md5-cache/app-accessibility/brltty-6.1
 2205022240 metadata/md5-cache/app-accessibility/brltty-6.1-r1
 2205022240 metadata/md5-cache/app-accessibility/brltty-6.4
 2205022240 metadata/md5-cache/app-accessibility/brltty-6.4-r1
 2205022240 metadata/md5-cache/app-accessibility/freetts-1.2.2-r2
 2205022240 metadata/md5-cache/app-accessibility/sphinx2-0.6
+2205070840 metadata/md5-cache/app-accessibility/Manifest.gz
+2205070840 metadata/md5-cache/app-accessibility/edbrowse-3.8.2.1-r1
 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
@@ -31657,7 +31656,6 @@
 2205011048 metadata/md5-cache/app-admin/salt-3003.3
 2205011048 metadata/md5-cache/app-admin/salt-3003.3-r1
 2205011048 metadata/md5-cache/app-admin/salt-3003.4-r1
-2205011048 metadata/md5-cache/app-admin/salt-3004.1-r4
 2204302241 metadata/md5-cache/app-admin/selint-9999
 2205011048 metadata/md5-cache/app-admin/setools-4.4.0-r2
 2205011048 metadata/md5-cache/app-admin/setools-4.4.0-r3
@@ -31702,8 +31700,12 @@
 2205051410 metadata/md5-cache/app-admin/sudo-1.9.10-r1
 2205051040 metadata/md5-cache/app-admin/sudo-1.9.8_p2-r1
 2205051040 metadata/md5-cache/app-admin/sudo-9999
-2205061040 metadata/md5-cache/app-admin/Manifest.gz
 2205061040 metadata/md5-cache/app-admin/awscli-1.23.8
+2205070910 metadata/md5-cache/app-admin/Manifest.gz
+2205062310 metadata/md5-cache/app-admin/salt-3004.1-r4
+2205070910 metadata/md5-cache/app-admin/tpm-1.3.3
+2205070910 metadata/md5-cache/app-admin/tpm-9999
+2205070740 metadata/md5-cache/app-admin/xstow-1.0.2-r1
 2204151540 metadata/md5-cache/app-antivirus/lkrg-0.9.2
 2204212139 metadata/md5-cache/app-antivirus/lkrg-0.9.3
 2205011048 metadata/md5-cache/app-antivirus/clamav-0.104.2
@@ -32210,8 +32212,6 @@
 2205011048 metadata/md5-cache/app-crypt/sequoia-sq-0.25.0
 2205011048 metadata/md5-cache/app-crypt/sequoia-sq-0.26.0
 2205011048 metadata/md5-cache/app-crypt/sequoia-sqv-1.1.0
-2204302241 metadata/md5-cache/app-crypt/signing-party-2.10-r1
-2204302241 metadata/md5-cache/app-crypt/signing-party-2.11
 2204302241 metadata/md5-cache/app-crypt/ssdeep-2.14.1
 2204302241 metadata/md5-cache/app-crypt/stan-0.4.1-r1
 2205011048 metadata/md5-cache/app-crypt/swtpm-0.7.2
@@ -32245,9 +32245,10 @@
 2205050410 metadata/md5-cache/app-crypt/certbot-1.27.0
 2205050410 metadata/md5-cache/app-crypt/certbot-apache-1.27.0
 2205050410 metadata/md5-cache/app-crypt/certbot-nginx-1.27.0
-2205060310 metadata/md5-cache/app-crypt/Manifest.gz
 2205052310 metadata/md5-cache/app-crypt/acme-sh-3.0.3
 2205060310 metadata/md5-cache/app-crypt/argon2-20190702-r1
+2205062310 metadata/md5-cache/app-crypt/Manifest.gz
+2205062310 metadata/md5-cache/app-crypt/signing-party-2.11
 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
@@ -32953,7 +32954,6 @@
 2204041639 metadata/md5-cache/app-doc/elisp-manual-27.2
 2204172340 metadata/md5-cache/app-doc/casting-spels-emacs-19-r2
 2204172340 metadata/md5-cache/app-doc/eclass-manpages-20220417
-2205011048 metadata/md5-cache/app-doc/Manifest.gz
 2205011048 metadata/md5-cache/app-doc/NaturalDocs-1.52-r2
 2205011048 metadata/md5-cache/app-doc/cppman-0.5.3
 2205011048 metadata/md5-cache/app-doc/devmanual-0_pre20210118
@@ -32972,6 +32972,8 @@
 2205011048 metadata/md5-cache/app-doc/kicad-doc-6.0.4
 2205011048 metadata/md5-cache/app-doc/mathjax-docs-2.7.7
 2205011048 metadata/md5-cache/app-doc/zeal-0.6.1_p20200815
+2205070810 metadata/md5-cache/app-doc/Manifest.gz
+2205070810 metadata/md5-cache/app-doc/gnucash-docs-4.10.1
 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
@@ -33057,21 +33059,12 @@
 2204150840 metadata/md5-cache/app-editors/vscode-1.66.2
 2204150840 metadata/md5-cache/app-editors/vscodium-1.66.2
 2204180941 metadata/md5-cache/app-editors/diakonos-0.9.7
-2204172340 metadata/md5-cache/app-editors/emacs-28.1
 2204230909 metadata/md5-cache/app-editors/ghostwriter-2.1.2
 2204251610 metadata/md5-cache/app-editors/ghostwriter-2.0.2
 2204290740 metadata/md5-cache/app-editors/nano-6.3
 2205011048 metadata/md5-cache/app-editors/bluefish-2.2.12
 2204302241 metadata/md5-cache/app-editors/curses-hexedit-0.9.7-r1
 2205011048 metadata/md5-cache/app-editors/ecrire-0.2.0-r1
-2204302241 metadata/md5-cache/app-editors/emacs-23.4-r21
-2204302241 metadata/md5-cache/app-editors/emacs-24.5-r11
-2204302241 metadata/md5-cache/app-editors/emacs-25.3-r11
-2204302241 metadata/md5-cache/app-editors/emacs-26.3-r6
-2204302241 metadata/md5-cache/app-editors/emacs-27.2-r5
-2204302241 metadata/md5-cache/app-editors/emacs-28.1.9999
-2204302241 metadata/md5-cache/app-editors/emacs-29.0.9999
-2204302241 metadata/md5-cache/app-editors/fe-2.0-r1
 2205011048 metadata/md5-cache/app-editors/featherpad-1.0.0
 2205011048 metadata/md5-cache/app-editors/featherpad-1.0.1
 2205011048 metadata/md5-cache/app-editors/featherpad-1.1.0
@@ -33140,12 +33133,20 @@
 2205022240 metadata/md5-cache/app-editors/pluma-1.24.2
 2205031710 metadata/md5-cache/app-editors/gnome-latex-3.40.0
 2205032140 metadata/md5-cache/app-editors/nano-6.2
-2205050840 metadata/md5-cache/app-editors/emacs-26.3-r7
 2205051040 metadata/md5-cache/app-editors/vim-core-8.2.4586
 2205051310 metadata/md5-cache/app-editors/vim-core-9999
-2205060512 metadata/md5-cache/app-editors/Manifest.gz
 2205060512 metadata/md5-cache/app-editors/vim-8.2.4586
 2205060512 metadata/md5-cache/app-editors/vim-9999
+2205070940 metadata/md5-cache/app-editors/Manifest.gz
+2205070940 metadata/md5-cache/app-editors/emacs-23.4-r21
+2205070940 metadata/md5-cache/app-editors/emacs-24.5-r11
+2205070940 metadata/md5-cache/app-editors/emacs-25.3-r11
+2205070940 metadata/md5-cache/app-editors/emacs-26.3-r7
+2205070940 metadata/md5-cache/app-editors/emacs-27.2-r5
+2205070940 metadata/md5-cache/app-editors/emacs-28.1
+2205070940 metadata/md5-cache/app-editors/emacs-28.1.9999
+2205070940 metadata/md5-cache/app-editors/emacs-29.0.9999
+2205070040 metadata/md5-cache/app-editors/fe-2.0-r1
 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
@@ -33234,7 +33235,6 @@
 2204190139 metadata/md5-cache/app-emacs/dune-format-0.1
 2204172340 metadata/md5-cache/app-emacs/ebuild-mode-1.56
 2204172340 metadata/md5-cache/app-emacs/ebuild-run-mode-20210713
-2204172340 metadata/md5-cache/app-emacs/ecb-2.50_pre20170728
 2204172340 metadata/md5-cache/app-emacs/edb-1.32
 2204172340 metadata/md5-cache/app-emacs/edit-list-0.3
 2204172340 metadata/md5-cache/app-emacs/edit-server-1.15
@@ -33573,9 +33573,11 @@
 2205042010 metadata/md5-cache/app-emacs/emacs-ipython-notebook-0.17.0_p20220419
 2205041610 metadata/md5-cache/app-emacs/polymode-0.2.2_p20220322
 2205041610 metadata/md5-cache/app-emacs/request-0.3.3_p20220318
-2205051440 metadata/md5-cache/app-emacs/Manifest.gz
 2205051040 metadata/md5-cache/app-emacs/org-static-blog-1.6.0
 2205051440 metadata/md5-cache/app-emacs/typescript-mode-0.4
+2205070110 metadata/md5-cache/app-emacs/Manifest.gz
+2205062240 metadata/md5-cache/app-emacs/ecb-2.50_pre20170728
+2205070110 metadata/md5-cache/app-emacs/rainbow-mode-1.0.6
 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
@@ -33783,7 +33785,6 @@
 2203252323 metadata/md5-cache/app-eselect/eselect-php-0.9.8
 2204020640 metadata/md5-cache/app-eselect/eselect-fontconfig-1.1-r1
 2204020640 metadata/md5-cache/app-eselect/eselect-fontconfig-1.1-r2
-2204030339 metadata/md5-cache/app-eselect/eselect-fontconfig-20220403
 2204291110 metadata/md5-cache/app-eselect/eselect-iptables-20220320
 2204290540 metadata/md5-cache/app-eselect/eselect-lib-bin-symlink-0.1.1-r1
 2204290540 metadata/md5-cache/app-eselect/eselect-pinentry-0.7.2
@@ -33794,7 +33795,8 @@
 2204302241 metadata/md5-cache/app-eselect/eselect-rust-20210703
 2204302241 metadata/md5-cache/app-eselect/eselect-vi-1.2
 2205020010 metadata/md5-cache/app-eselect/eselect-java-0.4.3
-2205022310 metadata/md5-cache/app-eselect/Manifest.gz
+2205070740 metadata/md5-cache/app-eselect/Manifest.gz
+2205070740 metadata/md5-cache/app-eselect/eselect-fontconfig-20220403
 2005211139 metadata/md5-cache/app-forensics/examiner-0.5-r3
 1702282309 metadata/md5-cache/app-forensics/scalpel-2.0
 2201061240 metadata/md5-cache/app-forensics/air-2.0.0-r2
@@ -33841,8 +33843,6 @@
 2102270209 metadata/md5-cache/app-i18n/ibus-rime-1.5.0
 1708161738 metadata/md5-cache/app-i18n/ibus-table-extraphrase-1.3.9.20110826
 1708161738 metadata/md5-cache/app-i18n/ibus-table-latin-1.2.0.20100305
-2110151709 metadata/md5-cache/app-i18n/ibus-table-others-1.3.11
-2111081639 metadata/md5-cache/app-i18n/ibus-table-others-1.3.12
 2101061639 metadata/md5-cache/app-i18n/kakasi-2.3.6
 2008011539 metadata/md5-cache/app-i18n/libcangjie-1.3
 2107240239 metadata/md5-cache/app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1
@@ -33996,7 +33996,6 @@
 2205011048 metadata/md5-cache/app-i18n/yaskkserv2-0.1.1-r1
 2205011048 metadata/md5-cache/app-i18n/zinnia-0.06-r3
 2204302241 metadata/md5-cache/app-i18n/zinnia-tomoe-0.6.0_p20080911
-2205022240 metadata/md5-cache/app-i18n/Manifest.gz
 2205022240 metadata/md5-cache/app-i18n/im-freewnn-0.0.2-r2
 2205022240 metadata/md5-cache/app-i18n/im-freewnn-0.0.2-r3
 2205022240 metadata/md5-cache/app-i18n/mecab-skkserv-0.03
@@ -34004,6 +34003,9 @@
 2205022240 metadata/md5-cache/app-i18n/scim-1.4.18
 2205022240 metadata/md5-cache/app-i18n/scim-anthy-1.2.7-r1
 2205022240 metadata/md5-cache/app-i18n/scim-bridge-0.4.16-r3
+2205071010 metadata/md5-cache/app-i18n/Manifest.gz
+2205071010 metadata/md5-cache/app-i18n/ibus-table-others-1.3.12
+2205071010 metadata/md5-cache/app-i18n/ibus-table-others-1.3.13
 2002112051 metadata/md5-cache/app-laptop/hdaps-gl-0.0.7
 2203252323 metadata/md5-cache/app-laptop/ibam-0.5.2-r4
 2203252323 metadata/md5-cache/app-laptop/laptop-mode-tools-1.74
@@ -34030,8 +34032,9 @@
 2205011048 metadata/md5-cache/app-laptop/thinkfan-1.0.2
 2205011048 metadata/md5-cache/app-laptop/thinkfan-1.2.1
 2205011048 metadata/md5-cache/app-laptop/thinkfan-1.2.2
-2205022240 metadata/md5-cache/app-laptop/Manifest.gz
 2205022240 metadata/md5-cache/app-laptop/tp_smapi-0.43-r1
+2205070740 metadata/md5-cache/app-laptop/Manifest.gz
+2205070740 metadata/md5-cache/app-laptop/thinkfan-1.3.1
 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
@@ -34080,8 +34083,10 @@
 2205011048 metadata/md5-cache/app-metrics/unbound-telemetry-0.1.0_pre20210920
 2205022240 metadata/md5-cache/app-metrics/collectd-5.12.0-r5
 2205022240 metadata/md5-cache/app-metrics/collectd-5.12.0-r6
-2205060140 metadata/md5-cache/app-metrics/Manifest.gz
 2205060140 metadata/md5-cache/app-metrics/ceph_exporter-4.0.1
+2205062040 metadata/md5-cache/app-metrics/Manifest.gz
+2205062040 metadata/md5-cache/app-metrics/ceph_exporter-2.0.7
+2205062040 metadata/md5-cache/app-metrics/ceph_exporter-3.0.0
 1806092239 metadata/md5-cache/app-misc/acdctl-1.1-r1
 2104190739 metadata/md5-cache/app-misc/aldo-0.7.7
 1910161339 metadata/md5-cache/app-misc/astrolog-ephemeris-5.40
@@ -34527,8 +34532,9 @@
 2205051340 metadata/md5-cache/app-misc/screenfetch-9999
 2205051110 metadata/md5-cache/app-misc/tmux-3.2a
 2205051110 metadata/md5-cache/app-misc/tmux-9999
-2205061710 metadata/md5-cache/app-misc/Manifest.gz
 2205061710 metadata/md5-cache/app-misc/khal-0.10.4-r1
+2205062210 metadata/md5-cache/app-misc/Manifest.gz
+2205062210 metadata/md5-cache/app-misc/nnn-4.5
 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
@@ -34596,7 +34602,6 @@
 2205011048 metadata/md5-cache/app-office/unoconv-0.9.0-r1
 2205020310 metadata/md5-cache/app-office/libreoffice-bin-debug-7.2.6.2
 2205020310 metadata/md5-cache/app-office/libreoffice-l10n-7.2.6.2
-2205030110 metadata/md5-cache/app-office/Manifest.gz
 2205022240 metadata/md5-cache/app-office/abiword-docs-3.0.2
 2205022240 metadata/md5-cache/app-office/dia-0.97.3-r1
 2205022240 metadata/md5-cache/app-office/dia2code-1.0.0
@@ -34612,6 +34617,9 @@
 2205022240 metadata/md5-cache/app-office/moneydance-2022.4060
 2205022240 metadata/md5-cache/app-office/pinpoint-0.1.8-r1
 2205022240 metadata/md5-cache/app-office/planner-0.14.6_p20130520-r2
+2205070810 metadata/md5-cache/app-office/Manifest.gz
+2205070810 metadata/md5-cache/app-office/gnucash-4.10
+2205070710 metadata/md5-cache/app-office/lyx-2.3.6.1-r2
 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
@@ -34754,10 +34762,8 @@
 1912110241 metadata/md5-cache/app-shells/pdsh-2.26-r1
 2104060140 metadata/md5-cache/app-shells/push-2.0-r1
 2104060140 metadata/md5-cache/app-shells/push-3.4
-2109192209 metadata/md5-cache/app-shells/pwsh-bin-7.1.4
 1907130039 metadata/md5-cache/app-shells/rush-2.1
 2108101909 metadata/md5-cache/app-shells/zsh-completions-0.33.0
-2111210409 metadata/md5-cache/app-shells/pwsh-bin-7.2.0
 2112150739 metadata/md5-cache/app-shells/pwsh-bin-7.2.1
 2201032109 metadata/md5-cache/app-shells/rush-2.2
 2202132309 metadata/md5-cache/app-shells/liquidprompt-2.0.4
@@ -34807,8 +34813,6 @@
 2204192239 metadata/md5-cache/app-shells/bash-9999
 2204290540 metadata/md5-cache/app-shells/bash-5.1_p16
 2205011048 metadata/md5-cache/app-shells/autojump-22.5.3-r1
-2205011048 metadata/md5-cache/app-shells/bash-completion-2.11
-2205011048 metadata/md5-cache/app-shells/bash-completion-9999
 2204302241 metadata/md5-cache/app-shells/ctypes-sh-1.2-r1
 2205011048 metadata/md5-cache/app-shells/fish-3.3.1-r1
 2205011048 metadata/md5-cache/app-shells/fish-3.4.1
@@ -34842,9 +34846,11 @@
 2205022240 metadata/md5-cache/app-shells/tcsh-6.22.02-r1
 2205040640 metadata/md5-cache/app-shells/nushell-0.62.0
 2205032110 metadata/md5-cache/app-shells/zsh-syntax-highlighting-0.7.1
-2205051110 metadata/md5-cache/app-shells/Manifest.gz
 2205051110 metadata/md5-cache/app-shells/zsh-5.8.1-r2
 2205051110 metadata/md5-cache/app-shells/zsh-9999
+2205071110 metadata/md5-cache/app-shells/Manifest.gz
+2205071110 metadata/md5-cache/app-shells/bash-completion-2.11
+2205071110 metadata/md5-cache/app-shells/bash-completion-9999
 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
@@ -35288,13 +35294,13 @@
 2205032210 metadata/md5-cache/app-text/libspectre-0.2.10
 2205032210 metadata/md5-cache/app-text/scdoc-1.11.2-r1
 2205032210 metadata/md5-cache/app-text/scdoc-9999
-2205050840 metadata/md5-cache/app-text/App-XML-DocBook-Builder-0.100.300-r1
-2205051340 metadata/md5-cache/app-text/Manifest.gz
 2205051340 metadata/md5-cache/app-text/asciidoc-10.1.4
 2205050710 metadata/md5-cache/app-text/zathura-0.4.9
 2205050710 metadata/md5-cache/app-text/zathura-cb-0.1.9
 2205050710 metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.8-r1
 2205050710 metadata/md5-cache/app-text/zathura-ps-0.2.7
+2205062310 metadata/md5-cache/app-text/App-XML-DocBook-Builder-0.100.300-r1
+2205062310 metadata/md5-cache/app-text/Manifest.gz
 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
@@ -36065,24 +36071,19 @@
 2205041040 metadata/md5-cache/dev-db/citus-11.0.1_beta0
 2205040710 metadata/md5-cache/dev-db/postgresql-14.2-r1
 2205041040 metadata/md5-cache/dev-db/timescaledb-2.6.1
-2205051240 metadata/md5-cache/dev-db/Manifest.gz
 2205051240 metadata/md5-cache/dev-db/apgdiff-2.7.0
+2205062240 metadata/md5-cache/dev-db/Manifest.gz
+2205062240 metadata/md5-cache/dev-db/sqlite-3.38.5
 2106210925 metadata/md5-cache/dev-dotnet/ndesk-dbus-0.6.1a
 2106210925 metadata/md5-cache/dev-dotnet/ndesk-dbus-glib-0.4.1
-2202122309 metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-3.1.416
-2202122309 metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-5.0.301
-2202122309 metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-5.0.405
-2202122309 metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-6.0.100
-2202122309 metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-6.0.101
-2202122309 metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-6.0.102
-2203131909 metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-3.1.417
-2203131909 metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-5.0.406
-2203131909 metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-6.0.201
 2203252323 metadata/md5-cache/dev-dotnet/pe-format-2.1.2-r1
 2204072039 metadata/md5-cache/dev-dotnet/monocalendar-0.7.2
 2204302241 metadata/md5-cache/dev-dotnet/pe-format-9999
-2205022240 metadata/md5-cache/dev-dotnet/Manifest.gz
 2205022240 metadata/md5-cache/dev-dotnet/libgdiplus-6.0.2-r1
+2205062310 metadata/md5-cache/dev-dotnet/Manifest.gz
+2205062310 metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-3.1.418-r1
+2205062310 metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-5.0.407-r1
+2205062310 metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-6.0.202-r1
 1810241039 metadata/md5-cache/dev-embedded/arduino-ctags-20161123
 2104180939 metadata/md5-cache/dev-embedded/freaklabs-boards-1.0.0
 2105311239 metadata/md5-cache/dev-embedded/gpsim-0.30.0
@@ -37739,7 +37740,6 @@
 2204302241 metadata/md5-cache/dev-lang/php-8.1.5
 2204302241 metadata/md5-cache/dev-lang/polyml-5.9-r1
 2205011048 metadata/md5-cache/dev-lang/python-2.7.18_p14
-2205011048 metadata/md5-cache/dev-lang/python-2.7.18_p15
 2205011048 metadata/md5-cache/dev-lang/python-3.11.0_alpha7
 2205011048 metadata/md5-cache/dev-lang/python-3.7.13
 2205011048 metadata/md5-cache/dev-lang/python-3.8.13
@@ -37817,11 +37817,13 @@
 2205051540 metadata/md5-cache/dev-lang/idris2-0.5.1_p20211112-r1
 2205051540 metadata/md5-cache/dev-lang/idris2-0.5.1_p20220131-r1
 2205051540 metadata/md5-cache/dev-lang/idris2-0.5.1_p20220224-r1
-2205050240 metadata/md5-cache/dev-lang/ruby-3.1.2-r1
-2205061040 metadata/md5-cache/dev-lang/Manifest.gz
 2205061040 metadata/md5-cache/dev-lang/cfortran-20110621
 2205061040 metadata/md5-cache/dev-lang/cfortran-20210827
 2205060610 metadata/md5-cache/dev-lang/vala-0.56.1
+2205070940 metadata/md5-cache/dev-lang/Manifest.gz
+2205062340 metadata/md5-cache/dev-lang/nim-1.6.6
+2205062310 metadata/md5-cache/dev-lang/python-2.7.18_p15
+2205070940 metadata/md5-cache/dev-lang/ruby-3.1.2-r1
 2108220339 metadata/md5-cache/dev-libs/argtable-2.13-r1
 2107281439 metadata/md5-cache/dev-libs/atf-0.21-r2
 1808290309 metadata/md5-cache/dev-libs/bcm2835-1.57
@@ -38069,7 +38071,6 @@
 2204151540 metadata/md5-cache/dev-libs/libugpio-0.0.7-r1
 2204151540 metadata/md5-cache/dev-libs/openssl-3.0.2
 2204171840 metadata/md5-cache/dev-libs/libezV24-0.1.1-r2
-2204171942 metadata/md5-cache/dev-libs/ntl-11.5.1-r1
 2204182140 metadata/md5-cache/dev-libs/tree-sitter-0.20.6
 2204191339 metadata/md5-cache/dev-libs/tree-sitter-bash-0.19.0
 2204191339 metadata/md5-cache/dev-libs/tree-sitter-c-0.20.1
@@ -38267,7 +38268,6 @@
 2204302241 metadata/md5-cache/dev-libs/jemalloc-5.2.1-r1
 2204302241 metadata/md5-cache/dev-libs/jerasure-2.0.0-r2
 2205011048 metadata/md5-cache/dev-libs/json-c-0.15
-2205011048 metadata/md5-cache/dev-libs/json-c-0.16-r1
 2205011048 metadata/md5-cache/dev-libs/json-c-9999
 2205011048 metadata/md5-cache/dev-libs/json-glib-1.6.6-r1
 2205011048 metadata/md5-cache/dev-libs/jsoncpp-1.9.5
@@ -38477,7 +38477,6 @@
 2204302241 metadata/md5-cache/dev-libs/libudfread-9999
 2204302241 metadata/md5-cache/dev-libs/libuev-2.3.2-r1
 2204302241 metadata/md5-cache/dev-libs/libuv-1.43.0
-2204302241 metadata/md5-cache/dev-libs/libuv-1.44.1
 2205011048 metadata/md5-cache/dev-libs/libvarlink-22
 2204302241 metadata/md5-cache/dev-libs/libverto-0.3.1-r1
 2204302241 metadata/md5-cache/dev-libs/libverto-0.3.2
@@ -38784,7 +38783,6 @@
 2205050910 metadata/md5-cache/dev-libs/libzia-4.36
 2205051740 metadata/md5-cache/dev-libs/newt-0.52.21_p20210816
 2205051910 metadata/md5-cache/dev-libs/thrift-0.16.0-r1
-2205061110 metadata/md5-cache/dev-libs/Manifest.gz
 2205060610 metadata/md5-cache/dev-libs/dbus-glib-0.112
 2205060610 metadata/md5-cache/dev-libs/libaio-0.3.113
 2205060310 metadata/md5-cache/dev-libs/libcbor-0.9.0
@@ -38795,6 +38793,11 @@
 2205061110 metadata/md5-cache/dev-libs/poco-1.11.2
 2205060610 metadata/md5-cache/dev-libs/vala-common-0.56.1
 2205060310 metadata/md5-cache/dev-libs/xmlsec-1.2.34
+2205071040 metadata/md5-cache/dev-libs/Manifest.gz
+2205070740 metadata/md5-cache/dev-libs/json-c-0.16-r1
+2205070910 metadata/md5-cache/dev-libs/libuv-1.44.1
+2205070310 metadata/md5-cache/dev-libs/ntl-11.5.1-r1
+2205071040 metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.7.0
 2203240726 metadata/md5-cache/dev-lisp/ecls-21.2.1-r4
 2203252323 metadata/md5-cache/dev-lisp/cmucl-21c
 2203252323 metadata/md5-cache/dev-lisp/sbcl-2.2.0
@@ -41174,16 +41177,16 @@
 2205011048 metadata/md5-cache/dev-perl/syntax-0.4.0-r2
 2205011048 metadata/md5-cache/dev-perl/tkispell-0.200.0
 2205011048 metadata/md5-cache/dev-perl/txt2html-2.530.0
-2205050840 metadata/md5-cache/dev-perl/Class-XSAccessor-1.190.0-r1
-2205050840 metadata/md5-cache/dev-perl/Data-Dump-1.250.0
 2205051010 metadata/md5-cache/dev-perl/File-Find-Object-0.3.6
 2205051010 metadata/md5-cache/dev-perl/File-TreeCreate-0.0.1
 2205050240 metadata/md5-cache/dev-perl/HTML-Template-Pro-0.952.400
 2205050910 metadata/md5-cache/dev-perl/IO-All-0.870.0-r1
 2205051340 metadata/md5-cache/dev-perl/IO-Tty-1.160.0
-2205050840 metadata/md5-cache/dev-perl/Test-Trap-0.3.4
 2205061210 metadata/md5-cache/dev-perl/Crypt-PasswdMD5-1.410.0
-2205061210 metadata/md5-cache/dev-perl/Manifest.gz
+2205062310 metadata/md5-cache/dev-perl/Class-XSAccessor-1.190.0-r1
+2205062310 metadata/md5-cache/dev-perl/Data-Dump-1.250.0
+2205062310 metadata/md5-cache/dev-perl/Manifest.gz
+2205062310 metadata/md5-cache/dev-perl/Test-Trap-0.3.4
 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
@@ -42119,14 +42122,10 @@
 2205011048 metadata/md5-cache/dev-python/flufl-i18n-4.0
 2205011048 metadata/md5-cache/dev-python/flufl-lock-7.0-r1
 2205011048 metadata/md5-cache/dev-python/flufl-testing-0.8
-2205011048 metadata/md5-cache/dev-python/fonttools-4.30.0
-2205011048 metadata/md5-cache/dev-python/fonttools-4.31.1
-2205011048 metadata/md5-cache/dev-python/fonttools-4.31.2
 2205011048 metadata/md5-cache/dev-python/fonttools-4.32.0
 2205011048 metadata/md5-cache/dev-python/fonttools-4.33.0
 2205011048 metadata/md5-cache/dev-python/fonttools-4.33.1
 2205011048 metadata/md5-cache/dev-python/fonttools-4.33.2
-2205011048 metadata/md5-cache/dev-python/fonttools-4.33.3
 2205011048 metadata/md5-cache/dev-python/fqdn-1.5.1-r1
 2205011048 metadata/md5-cache/dev-python/freezegun-1.2.1
 2205011048 metadata/md5-cache/dev-python/fritzconnection-1.7.1
@@ -42284,8 +42283,6 @@
 2205011048 metadata/md5-cache/dev-python/intelhex-2.3.0
 2205011048 metadata/md5-cache/dev-python/intervaltree-3.1.0
 2205011048 metadata/md5-cache/dev-python/iocapture-0.1.2-r2
-2205011048 metadata/md5-cache/dev-python/ioflo-2.0.2-r1
-2205011048 metadata/md5-cache/dev-python/ioflo-2.0.2-r2
 2205011048 metadata/md5-cache/dev-python/ipaddr-2.2.0-r2
 2205011048 metadata/md5-cache/dev-python/ipdb-0.13.9-r1
 2205011048 metadata/md5-cache/dev-python/ipy-1.01-r1
@@ -42394,7 +42391,6 @@
 2205011048 metadata/md5-cache/dev-python/kconfiglib-14.1.0
 2205011048 metadata/md5-cache/dev-python/keep-2.10.1
 2205011048 metadata/md5-cache/dev-python/keystoneauth-4.5.0
-2205011048 metadata/md5-cache/dev-python/kiwisolver-1.4.1
 2205011048 metadata/md5-cache/dev-python/klein-21.8.0
 2205011048 metadata/md5-cache/dev-python/kombu-5.2.1
 2205011048 metadata/md5-cache/dev-python/kombu-5.2.3-r1
@@ -42593,7 +42589,6 @@
 2205011048 metadata/md5-cache/dev-python/nptyping-1.4.4
 2205011048 metadata/md5-cache/dev-python/nptyping-2.0.0
 2205011048 metadata/md5-cache/dev-python/nptyping-2.0.1
-2205011048 metadata/md5-cache/dev-python/nspektr-0.3.0
 2205011048 metadata/md5-cache/dev-python/ntlm-auth-1.5.0
 2205011048 metadata/md5-cache/dev-python/ntplib-0.4.0
 2205011048 metadata/md5-cache/dev-python/nuitka-0.7.1
@@ -42883,7 +42878,6 @@
 2205011048 metadata/md5-cache/dev-python/pylibacl-0.6.0
 2205011048 metadata/md5-cache/dev-python/pylibmc-1.6.1-r2
 2205011048 metadata/md5-cache/dev-python/pylint-2.12.2
-2205011048 metadata/md5-cache/dev-python/pylint-2.13.5
 2205011048 metadata/md5-cache/dev-python/pylint-2.13.7
 2205011048 metadata/md5-cache/dev-python/pylru-1.2.0
 2205011048 metadata/md5-cache/dev-python/pylru-1.2.1
@@ -43020,15 +43014,11 @@
 2205011048 metadata/md5-cache/dev-python/pytest-rerunfailures-10.2
 2205011048 metadata/md5-cache/dev-python/pytest-salt-2020.1.27-r3
 2205011048 metadata/md5-cache/dev-python/pytest-salt-factories-0.121.1-r1
-2205011048 metadata/md5-cache/dev-python/pytest-salt-factories-1.0.0_rc13
 2205011048 metadata/md5-cache/dev-python/pytest-services-2.2.1
-2205011048 metadata/md5-cache/dev-python/pytest-shell-utilities-1.0.5
 2205011048 metadata/md5-cache/dev-python/pytest-shutil-1.7.0-r2
-2205011048 metadata/md5-cache/dev-python/pytest-skip-markers-1.2.0
 2205011048 metadata/md5-cache/dev-python/pytest-subtesthack-0.1.2-r1
 2205011048 metadata/md5-cache/dev-python/pytest-subtests-0.7.0
 2205011048 metadata/md5-cache/dev-python/pytest-sugar-0.9.4
-2205011048 metadata/md5-cache/dev-python/pytest-system-statistics-1.0.2
 2205011048 metadata/md5-cache/dev-python/pytest-tempdir-2019.10.12
 2205011048 metadata/md5-cache/dev-python/pytest-testinfra-6.6.0
 2205011048 metadata/md5-cache/dev-python/pytest-testinfra-6.7.0
@@ -43130,7 +43120,6 @@
 2205011048 metadata/md5-cache/dev-python/python_orocos_kdl-1.5.0
 2205011048 metadata/md5-cache/dev-python/python_orocos_kdl-1.5.1
 2205011048 metadata/md5-cache/dev-python/python_orocos_kdl-9999
-2205011048 metadata/md5-cache/dev-python/pythondialog-3.5.1
 2205011048 metadata/md5-cache/dev-python/pythran-0.11.0
 2205011048 metadata/md5-cache/dev-python/pytidylib-0.3.2-r2
 2205011048 metadata/md5-cache/dev-python/pytimeparse-1.1.8
@@ -43178,8 +43167,6 @@
 2205011048 metadata/md5-cache/dev-python/quex-0.71.2
 2205011048 metadata/md5-cache/dev-python/radon-5.1.0-r1
 2205011048 metadata/md5-cache/dev-python/radon-5.1.0-r2
-2205011048 metadata/md5-cache/dev-python/raet-0.6.8-r3
-2205011048 metadata/md5-cache/dev-python/raet-0.6.8-r4
 2205011048 metadata/md5-cache/dev-python/random2-1.0.1-r2
 2205011048 metadata/md5-cache/dev-python/rarfile-4.0
 2205011048 metadata/md5-cache/dev-python/ratelimit-2.2.1
@@ -43279,13 +43266,6 @@
 2205011048 metadata/md5-cache/dev-python/serverfiles-0.3.1
 2205011048 metadata/md5-cache/dev-python/service_identity-21.1.0
 2205011048 metadata/md5-cache/dev-python/setproctitle-1.2.2
-2205011048 metadata/md5-cache/dev-python/setuptools-60.10.0
-2205011048 metadata/md5-cache/dev-python/setuptools-60.5.0
-2205011048 metadata/md5-cache/dev-python/setuptools-60.9.2
-2205011048 metadata/md5-cache/dev-python/setuptools-61.3.0
-2205011048 metadata/md5-cache/dev-python/setuptools-61.3.1-r1
-2205011048 metadata/md5-cache/dev-python/setuptools-62.0.0
-2205011048 metadata/md5-cache/dev-python/setuptools-declarative-requirements-1.2.0-r1
 2205011048 metadata/md5-cache/dev-python/setuptools-git-1.2-r2
 2205011048 metadata/md5-cache/dev-python/setuptools-rust-1.3.0
 2205011048 metadata/md5-cache/dev-python/setuptools_scm-6.4.1
@@ -43584,9 +43564,6 @@
 2205011048 metadata/md5-cache/dev-python/waitress-2.1.1
 2205011048 metadata/md5-cache/dev-python/wand-0.6.7
 2205011048 metadata/md5-cache/dev-python/warlock-1.3.3-r3
-2205011048 metadata/md5-cache/dev-python/watchdog-1.0.2
-2205011048 metadata/md5-cache/dev-python/watchdog-2.1.6
-2205011048 metadata/md5-cache/dev-python/watchdog-2.1.7
 2205011048 metadata/md5-cache/dev-python/watchfiles-0.13
 2205011048 metadata/md5-cache/dev-python/watchgod-0.8.1
 2205011048 metadata/md5-cache/dev-python/watchgod-0.8.2
@@ -43730,7 +43707,6 @@
 2205031210 metadata/md5-cache/dev-python/dask-2022.05.0
 2205031310 metadata/md5-cache/dev-python/deepmerge-1.0.1
 2205022240 metadata/md5-cache/dev-python/django-taggit-3.0.0
-2205022240 metadata/md5-cache/dev-python/fs-2.4.16
 2205022240 metadata/md5-cache/dev-python/funcparserlib-1.0.0
 2205022240 metadata/md5-cache/dev-python/ghp-import-2.1.0
 2205031140 metadata/md5-cache/dev-python/google-api-core-2.7.3
@@ -43796,12 +43772,8 @@
 2205051040 metadata/md5-cache/dev-python/defcon-0.10.1
 2205051110 metadata/md5-cache/dev-python/django-haystack-3.2.1
 2205051310 metadata/md5-cache/dev-python/dnspython-2.2.1
-2205051040 metadata/md5-cache/dev-python/ephemeral-port-reserve-1.1.4
 2205050840 metadata/md5-cache/dev-python/executing-0.8.3
-2205050840 metadata/md5-cache/dev-python/ini2toml-0.10
-2205050840 metadata/md5-cache/dev-python/ipython-8.2.0
 2205050610 metadata/md5-cache/dev-python/ipython-8.3.0-r1
-2205050910 metadata/md5-cache/dev-python/kiwisolver-1.4.2
 2205050840 metadata/md5-cache/dev-python/littleutils-0.2.2
 2205050610 metadata/md5-cache/dev-python/matplotlib-3.4.3-r1
 2205050610 metadata/md5-cache/dev-python/matplotlib-3.5.1
@@ -43820,14 +43792,10 @@
 2205050610 metadata/md5-cache/dev-python/python-pam-2.0.2-r1
 2205051040 metadata/md5-cache/dev-python/pytools-2022.1.7
 2205050610 metadata/md5-cache/dev-python/setproctitle-1.2.3
-2205050840 metadata/md5-cache/dev-python/setuptools-62.1.0
-2205051610 metadata/md5-cache/dev-python/sqlalchemy-1.4.35
 2205050840 metadata/md5-cache/dev-python/stack_data-0.2.0
 2205051040 metadata/md5-cache/dev-python/tldextract-3.3.0
 2205050840 metadata/md5-cache/dev-python/typeguard-2.13.3
 2205051040 metadata/md5-cache/dev-python/validators-0.19.0
-2205051040 metadata/md5-cache/dev-python/werkzeug-2.1.1
-2205061740 metadata/md5-cache/dev-python/Manifest.gz
 2205061640 metadata/md5-cache/dev-python/astor-0.8.1-r1
 2205061110 metadata/md5-cache/dev-python/boolean-py-4.0
 2205061040 metadata/md5-cache/dev-python/boto3-1.22.8
@@ -43838,7 +43806,6 @@
 2205061610 metadata/md5-cache/dev-python/flask-wtf-1.0.1
 2205061610 metadata/md5-cache/dev-python/fsspec-2022.3.0
 2205052310 metadata/md5-cache/dev-python/gpep517-3
-2205052310 metadata/md5-cache/dev-python/gpep517-4
 2205061640 metadata/md5-cache/dev-python/immutables-0.17
 2205061640 metadata/md5-cache/dev-python/jeepney-0.8.0
 2205060210 metadata/md5-cache/dev-python/jsonschema-4.5.1
@@ -43850,10 +43817,8 @@
 2205061610 metadata/md5-cache/dev-python/phonenumbers-8.12.47
 2205061610 metadata/md5-cache/dev-python/prometheus_client-0.14.1
 2205061510 metadata/md5-cache/dev-python/prompt_toolkit-3.0.29
-2205061640 metadata/md5-cache/dev-python/pytesseract-0.3.10
 2205061140 metadata/md5-cache/dev-python/pytest-localserver-0.6.0
 2205061640 metadata/md5-cache/dev-python/pytest-trio-0.7.0-r1
-2205061610 metadata/md5-cache/dev-python/pythondialog-3.5.3
 2205061510 metadata/md5-cache/dev-python/redis-py-4.2.2
 2205061640 metadata/md5-cache/dev-python/sniffio-1.2.0
 2205061640 metadata/md5-cache/dev-python/sphinxcontrib-trio-1.1.2
@@ -43862,9 +43827,34 @@
 2205061640 metadata/md5-cache/dev-python/trio-0.20.0
 2205061610 metadata/md5-cache/dev-python/twine-4.0.0
 2205061610 metadata/md5-cache/dev-python/tzlocal-4.2
-2205061740 metadata/md5-cache/dev-python/ujson-5.2.0-r1
 2205061140 metadata/md5-cache/dev-python/xarray-2022.3.0
 2205061610 metadata/md5-cache/dev-python/zipp-3.8.0
+2205071110 metadata/md5-cache/dev-python/Manifest.gz
+2205062310 metadata/md5-cache/dev-python/ephemeral-port-reserve-1.1.4
+2205062310 metadata/md5-cache/dev-python/fonttools-4.31.2
+2205070740 metadata/md5-cache/dev-python/fonttools-4.33.3
+2205070740 metadata/md5-cache/dev-python/fs-2.4.16
+2205070010 metadata/md5-cache/dev-python/gpep517-5
+2205062310 metadata/md5-cache/dev-python/ini2toml-0.10
+2205062310 metadata/md5-cache/dev-python/ioflo-2.0.2-r2
+2205062310 metadata/md5-cache/dev-python/ipython-8.2.0
+2205062310 metadata/md5-cache/dev-python/kiwisolver-1.4.2
+2205062310 metadata/md5-cache/dev-python/nspektr-0.3.0
+2205070910 metadata/md5-cache/dev-python/pylint-2.13.5
+2205062210 metadata/md5-cache/dev-python/pytesseract-0.3.10
+2205062310 metadata/md5-cache/dev-python/pytest-salt-factories-1.0.0_rc13
+2205062310 metadata/md5-cache/dev-python/pytest-shell-utilities-1.0.5
+2205062310 metadata/md5-cache/dev-python/pytest-skip-markers-1.2.0
+2205062310 metadata/md5-cache/dev-python/pytest-system-statistics-1.0.2
+2205070740 metadata/md5-cache/dev-python/pythondialog-3.5.3
+2205062310 metadata/md5-cache/dev-python/raet-0.6.8-r4
+2205062310 metadata/md5-cache/dev-python/setuptools-60.10.0
+2205062310 metadata/md5-cache/dev-python/setuptools-62.1.0
+2205062310 metadata/md5-cache/dev-python/setuptools-declarative-requirements-1.2.0-r1
+2205062310 metadata/md5-cache/dev-python/sqlalchemy-1.4.35
+2205062140 metadata/md5-cache/dev-python/ujson-5.2.0-r1
+2205062310 metadata/md5-cache/dev-python/watchdog-2.1.7
+2205062310 metadata/md5-cache/dev-python/werkzeug-2.1.1
 2203252323 metadata/md5-cache/dev-qt/qt-creator-6.0.0
 2203252323 metadata/md5-cache/dev-qt/qt-creator-9999
 2203252323 metadata/md5-cache/dev-qt/qt-docs-5.15.2_p202011130614
@@ -45275,16 +45265,13 @@
 2204221010 metadata/md5-cache/dev-ruby/axiom-types-0.1.1-r1
 2204221010 metadata/md5-cache/dev-ruby/backports-3.20.2-r1
 2204221010 metadata/md5-cache/dev-ruby/backports-3.21.0
-2204221010 metadata/md5-cache/dev-ruby/backports-3.23.0
 2204221010 metadata/md5-cache/dev-ruby/bacon-1.2.0-r3
 2204221010 metadata/md5-cache/dev-ruby/bacon-1.2.0-r4
 2204221010 metadata/md5-cache/dev-ruby/barby-0.6.8
 2204221010 metadata/md5-cache/dev-ruby/base32-0.3.4
-2204221010 metadata/md5-cache/dev-ruby/base32-0.3.4-r1
 2204221010 metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16
 2204221010 metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16-r1
 2204221010 metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16-r2
-2204221010 metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.17
 2204221010 metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.1.0-r1
 2204221010 metadata/md5-cache/dev-ruby/benchmark-ips-2.10.0
 2204221010 metadata/md5-cache/dev-ruby/benchmark-ips-2.9.2
@@ -45320,23 +45307,17 @@
 2204221010 metadata/md5-cache/dev-ruby/bunny-2.17.0
 2204221010 metadata/md5-cache/dev-ruby/bunny-2.19.0
 2204221010 metadata/md5-cache/dev-ruby/c21e-1.2.1
-2204221010 metadata/md5-cache/dev-ruby/c21e-2.0.0
 2204221010 metadata/md5-cache/dev-ruby/capistrano-2.15.5-r3
 2204221010 metadata/md5-cache/dev-ruby/capistrano-3.16.0
 2204221010 metadata/md5-cache/dev-ruby/capybara-3.35.3
-2204221010 metadata/md5-cache/dev-ruby/capybara-3.36.0
 2204221010 metadata/md5-cache/dev-ruby/certificate_authority-1.0.0
 2204221010 metadata/md5-cache/dev-ruby/certified-1.0.0
-2204221010 metadata/md5-cache/dev-ruby/charlock_holmes-0.7.7-r1
-2204221010 metadata/md5-cache/dev-ruby/childprocess-3.0.0
-2204221010 metadata/md5-cache/dev-ruby/childprocess-4.0.0
 2204221010 metadata/md5-cache/dev-ruby/childprocess-4.1.0
 2204221010 metadata/md5-cache/dev-ruby/chronic-0.10.2-r1
 2204221010 metadata/md5-cache/dev-ruby/cinch-2.3.4
 2204221010 metadata/md5-cache/dev-ruby/classifier-reborn-2.2.0
 2204221010 metadata/md5-cache/dev-ruby/climate_control-0.2.0
 2204221010 metadata/md5-cache/dev-ruby/cliver-0.3.2-r1
-2204221010 metadata/md5-cache/dev-ruby/cmdparse-3.0.7
 2204221010 metadata/md5-cache/dev-ruby/cmdparse-3.0.7-r1
 2204221010 metadata/md5-cache/dev-ruby/coderay-1.1.2
 2204221010 metadata/md5-cache/dev-ruby/coderay-1.1.3-r1
@@ -45345,25 +45326,13 @@
 2204221010 metadata/md5-cache/dev-ruby/coffee-rails-5.0.0-r1
 2204221010 metadata/md5-cache/dev-ruby/coffee-script-2.4.1
 2204221010 metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2-r1
-2204221010 metadata/md5-cache/dev-ruby/color-1.8-r1
-2204221010 metadata/md5-cache/dev-ruby/colorator-1.1.0-r1
-2204221010 metadata/md5-cache/dev-ruby/colored-1.2-r1
-2204221010 metadata/md5-cache/dev-ruby/colored2-3.1.2
-2204221010 metadata/md5-cache/dev-ruby/colorize-0.8.1-r1
-2204221010 metadata/md5-cache/dev-ruby/columnize-0.9.0-r1
 2204221010 metadata/md5-cache/dev-ruby/combustion-1.3.4
 2204221010 metadata/md5-cache/dev-ruby/combustion-1.3.5
 2204221010 metadata/md5-cache/dev-ruby/commander-4.5.2
-2204221010 metadata/md5-cache/dev-ruby/commander-4.6.0
 2204221010 metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.9
-2204221010 metadata/md5-cache/dev-ruby/contracts-0.16.0
 2204221010 metadata/md5-cache/dev-ruby/contracts-0.16.1
-2204221010 metadata/md5-cache/dev-ruby/contracts-0.17
-2204221010 metadata/md5-cache/dev-ruby/coolio-1.7.1-r1
-2204221010 metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r2
 2204221010 metadata/md5-cache/dev-ruby/crass-1.0.6
 2204221010 metadata/md5-cache/dev-ruby/crass-1.0.6-r1
-2204221010 metadata/md5-cache/dev-ruby/creole-0.5.0-r1
 2204221010 metadata/md5-cache/dev-ruby/cri-2.15.11
 2204221010 metadata/md5-cache/dev-ruby/cri-2.15.11-r1
 2204221010 metadata/md5-cache/dev-ruby/css_parser-1.10.0
@@ -45374,7 +45343,6 @@
 2204221010 metadata/md5-cache/dev-ruby/curb-0.9.11-r1
 2204221010 metadata/md5-cache/dev-ruby/curses-1.4.2
 2204221010 metadata/md5-cache/dev-ruby/curses-1.4.3
-2204221010 metadata/md5-cache/dev-ruby/curses-1.4.4
 2204221010 metadata/md5-cache/dev-ruby/daemon_controller-1.2.0-r2
 2204221010 metadata/md5-cache/dev-ruby/daemons-1.3.1
 2204221010 metadata/md5-cache/dev-ruby/daemons-1.4.0
@@ -45563,7 +45531,6 @@
 2204221010 metadata/md5-cache/dev-ruby/marcel-0.3.3-r1
 2204221010 metadata/md5-cache/dev-ruby/marcel-1.0.2
 2204221010 metadata/md5-cache/dev-ruby/mash-0.1.1-r3
-2204221010 metadata/md5-cache/dev-ruby/matrix-0.4.2
 2204221010 metadata/md5-cache/dev-ruby/maxitest-3.7.0
 2204221010 metadata/md5-cache/dev-ruby/mechanize-2.8.3
 2204221010 metadata/md5-cache/dev-ruby/mechanize-2.8.4
@@ -46320,7 +46287,6 @@
 2205051440 metadata/md5-cache/dev-ruby/sass-listen-4.0.0-r1
 2205051440 metadata/md5-cache/dev-ruby/thor-1.2.1
 2205051440 metadata/md5-cache/dev-ruby/unf_ext-0.0.8
-2205061440 metadata/md5-cache/dev-ruby/Manifest.gz
 2205061310 metadata/md5-cache/dev-ruby/daemons-1.4.1
 2205061310 metadata/md5-cache/dev-ruby/database_cleaner-2.0.1
 2205061310 metadata/md5-cache/dev-ruby/database_cleaner-active_record-2.0.1
@@ -46365,6 +46331,30 @@
 2205061140 metadata/md5-cache/dev-ruby/rack-protection-2.2.0
 2205061440 metadata/md5-cache/dev-ruby/rrdtool-bindings-1.8.0
 2205061140 metadata/md5-cache/dev-ruby/sinatra-2.2.0
+2205070940 metadata/md5-cache/dev-ruby/Manifest.gz
+2205070940 metadata/md5-cache/dev-ruby/airbrussh-1.4.0-r1
+2205070940 metadata/md5-cache/dev-ruby/backports-3.23.0
+2205070940 metadata/md5-cache/dev-ruby/base32-0.3.4-r1
+2205070940 metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.17
+2205070940 metadata/md5-cache/dev-ruby/c21e-2.0.0
+2205070940 metadata/md5-cache/dev-ruby/capistrano-3.17.0
+2205070940 metadata/md5-cache/dev-ruby/capybara-3.36.0
+2205070940 metadata/md5-cache/dev-ruby/charlock_holmes-0.7.7-r1
+2205070940 metadata/md5-cache/dev-ruby/climate_control-1.0.1
+2205070940 metadata/md5-cache/dev-ruby/color-1.8-r1
+2205070940 metadata/md5-cache/dev-ruby/colorator-1.1.0-r1
+2205070940 metadata/md5-cache/dev-ruby/colored-1.2-r1
+2205070940 metadata/md5-cache/dev-ruby/colored2-3.1.2
+2205070940 metadata/md5-cache/dev-ruby/colorize-0.8.1-r1
+2205070940 metadata/md5-cache/dev-ruby/columnize-0.9.0-r1
+2205070940 metadata/md5-cache/dev-ruby/commander-4.6.0
+2205070940 metadata/md5-cache/dev-ruby/contracts-0.17
+2205070940 metadata/md5-cache/dev-ruby/coolio-1.7.1-r1
+2205070940 metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r2
+2205070940 metadata/md5-cache/dev-ruby/creole-0.5.0-r1
+2205070940 metadata/md5-cache/dev-ruby/curb-1.0.1
+2205070940 metadata/md5-cache/dev-ruby/curses-1.4.4
+2205070940 metadata/md5-cache/dev-ruby/matrix-0.4.2
 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
@@ -47033,7 +47023,6 @@
 2205011048 metadata/md5-cache/dev-util/ebuildtester-0.1.27
 2205011048 metadata/md5-cache/dev-util/ebuildtester-0.1.29
 2205011048 metadata/md5-cache/dev-util/ebuildtester-0.1.30
-2205011048 metadata/md5-cache/dev-util/edb-debugger-1.3.0
 2205011048 metadata/md5-cache/dev-util/edb-debugger-9999
 2205011048 metadata/md5-cache/dev-util/edi-0.8.0-r1
 2205011048 metadata/md5-cache/dev-util/edi-0.8.0-r2
@@ -47140,7 +47129,6 @@
 2204302241 metadata/md5-cache/dev-util/mdds-9999
 2205011048 metadata/md5-cache/dev-util/meld-3.20.4
 2205011048 metadata/md5-cache/dev-util/meson-0.60.3
-2205011048 metadata/md5-cache/dev-util/meson-0.61.4-r2
 2205011048 metadata/md5-cache/dev-util/meson-0.62.1
 2205011048 metadata/md5-cache/dev-util/meson-9999
 2205011048 metadata/md5-cache/dev-util/meson-format-array-0
@@ -47324,7 +47312,6 @@
 2205030540 metadata/md5-cache/dev-util/diffoscope-211
 2205022240 metadata/md5-cache/dev-util/dirdiff-2.1-r3
 2205022240 metadata/md5-cache/dev-util/duma-2.5.15-r2
-2205022240 metadata/md5-cache/dev-util/nemiver-0.9.6
 2205022240 metadata/md5-cache/dev-util/oprofile-1.4.0
 2205031340 metadata/md5-cache/dev-util/pkgcheck-9999
 2205022240 metadata/md5-cache/dev-util/shelltestrunner-1.9
@@ -47345,11 +47332,13 @@
 2205050740 metadata/md5-cache/dev-util/ragel-7.0.4-r2
 2205051140 metadata/md5-cache/dev-util/stripe-mock-0.125.0
 2205051510 metadata/md5-cache/dev-util/valgrind-3.18.1
-2205061110 metadata/md5-cache/dev-util/Manifest.gz
 2205060310 metadata/md5-cache/dev-util/cmocka-1.1.5
 2205060310 metadata/md5-cache/dev-util/cunit-2.1_p3
 2205061010 metadata/md5-cache/dev-util/jenkins-bin-2.332.3
 2205061110 metadata/md5-cache/dev-util/stripe-mock-0.126.0
+2205070740 metadata/md5-cache/dev-util/Manifest.gz
+2205070740 metadata/md5-cache/dev-util/edb-debugger-1.3.0
+2205062310 metadata/md5-cache/dev-util/meson-0.61.4-r2
 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
@@ -47458,10 +47447,8 @@
 2205011048 metadata/md5-cache/dev-vcs/qgit-2.10
 2205011048 metadata/md5-cache/dev-vcs/repo-2.15
 2205011048 metadata/md5-cache/dev-vcs/repo-2.17
-2205011048 metadata/md5-cache/dev-vcs/repo-2.21
 2204302241 metadata/md5-cache/dev-vcs/rsvndump-0.6-r1
 2204302241 metadata/md5-cache/dev-vcs/rsvndump-0.6.1
-2205011048 metadata/md5-cache/dev-vcs/stgit-1.4
 2205011048 metadata/md5-cache/dev-vcs/svneverever-1.5.0
 2205011048 metadata/md5-cache/dev-vcs/svneverever-1.6.0
 2205011048 metadata/md5-cache/dev-vcs/svneverever-1.7.1
@@ -47474,8 +47461,9 @@
 2205011048 metadata/md5-cache/dev-vcs/tortoisehg-9999
 2205022240 metadata/md5-cache/dev-vcs/bfg-1.13.0
 2205022240 metadata/md5-cache/dev-vcs/subversion-1.14.1
-2205061740 metadata/md5-cache/dev-vcs/Manifest.gz
-2205061740 metadata/md5-cache/dev-vcs/stgit-1.5
+2205070310 metadata/md5-cache/dev-vcs/Manifest.gz
+2205070310 metadata/md5-cache/dev-vcs/repo-2.21
+2205070310 metadata/md5-cache/dev-vcs/stgit-1.5
 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
@@ -48018,9 +48006,9 @@
 2204302241 metadata/md5-cache/games-misc/typespeed-0.6.5-r2
 2205011048 metadata/md5-cache/games-misc/usolitaire-0.2.1
 2204302241 metadata/md5-cache/games-misc/xcowsay-1.6
-2205051010 metadata/md5-cache/games-misc/Manifest.gz
-2205050840 metadata/md5-cache/games-misc/fortune-mod-3.12.0
 2205051010 metadata/md5-cache/games-misc/fortune-mod-3.14.0
+2205062310 metadata/md5-cache/games-misc/Manifest.gz
+2205062310 metadata/md5-cache/games-misc/fortune-mod-3.12.0
 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
@@ -48438,7 +48426,6 @@
 2205011048 metadata/md5-cache/gnome-base/gnome-shell-41.5
 2205011048 metadata/md5-cache/gnome-base/gnome-shell-42.0-r1
 2204302241 metadata/md5-cache/gnome-base/gnome-vfs-2.24.4-r5
-2205011048 metadata/md5-cache/gnome-base/gsettings-desktop-schemas-41.0
 2205011048 metadata/md5-cache/gnome-base/gsettings-desktop-schemas-42.0
 2205011048 metadata/md5-cache/gnome-base/gvfs-1.48.1-r1
 2205011048 metadata/md5-cache/gnome-base/gvfs-1.50.0
@@ -48448,7 +48435,6 @@
 2205011048 metadata/md5-cache/gnome-base/nautilus-41.2
 2205011048 metadata/md5-cache/gnome-base/nautilus-42.0
 2205011048 metadata/md5-cache/gnome-base/nautilus-42.1.1
-2205022240 metadata/md5-cache/gnome-base/Manifest.gz
 2205022240 metadata/md5-cache/gnome-base/gconf-3.2.6-r5
 2205022240 metadata/md5-cache/gnome-base/gnome-common-3.18.0-r1
 2205022240 metadata/md5-cache/gnome-base/gnome-menus-3.36.0
@@ -48457,6 +48443,9 @@
 2205022240 metadata/md5-cache/gnome-base/librsvg-2.52.7
 2205022240 metadata/md5-cache/gnome-base/librsvg-2.54.0
 2205022240 metadata/md5-cache/gnome-base/librsvg-2.54.1
+2205070610 metadata/md5-cache/gnome-base/Manifest.gz
+2205070610 metadata/md5-cache/gnome-base/gnome-shell-42.1
+2205062310 metadata/md5-cache/gnome-base/gsettings-desktop-schemas-41.0
 2203081240 metadata/md5-cache/gnome-extra/gnome-shell-frippery-41.1
 2203240726 metadata/md5-cache/gnome-extra/cinnamon-translations-5.0.2
 2203240726 metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.38.1
@@ -48510,7 +48499,6 @@
 2205011048 metadata/md5-cache/gnome-extra/evolution-data-server-3.44.1
 2205011048 metadata/md5-cache/gnome-extra/evolution-ews-3.42.4
 2205011048 metadata/md5-cache/gnome-extra/evolution-ews-3.44.0
-2205011048 metadata/md5-cache/gnome-extra/evolution-ews-3.44.1
 2205011048 metadata/md5-cache/gnome-extra/gnome-boxes-41.3
 2205011048 metadata/md5-cache/gnome-extra/gnome-boxes-42.0.1
 2205011048 metadata/md5-cache/gnome-extra/gnome-calculator-41.1
@@ -48583,7 +48571,6 @@
 2205041910 metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-45.0
 2205041910 metadata/md5-cache/gnome-extra/gnome-shell-extension-weather-in-the-clock-20220504
 2205042010 metadata/md5-cache/gnome-extra/pch-session-42.0
-2205050610 metadata/md5-cache/gnome-extra/Manifest.gz
 2205050610 metadata/md5-cache/gnome-extra/cinnamon-5.2.7-r3
 2205050610 metadata/md5-cache/gnome-extra/cinnamon-control-center-5.2.1-r1
 2205050610 metadata/md5-cache/gnome-extra/cinnamon-desktop-5.2.1
@@ -48595,6 +48582,9 @@
 2205050610 metadata/md5-cache/gnome-extra/cjs-5.2.0
 2205050610 metadata/md5-cache/gnome-extra/nemo-5.2.4
 2205050610 metadata/md5-cache/gnome-extra/nemo-fileroller-5.2.0
+2205070610 metadata/md5-cache/gnome-extra/Manifest.gz
+2205070610 metadata/md5-cache/gnome-extra/evolution-ews-3.44.1
+2205070610 metadata/md5-cache/gnome-extra/gnome-shell-extensions-42.1
 2204011845 metadata/md5-cache/gnustep-apps/aclock-0.4.0-r1
 2204011845 metadata/md5-cache/gnustep-apps/addresses-0.4.8-r1
 2204011845 metadata/md5-cache/gnustep-apps/batmon-0.8-r1
@@ -49704,9 +49694,10 @@
 2205011048 metadata/md5-cache/mail-filter/spamassassin-botnet-0.8-r1
 2205011048 metadata/md5-cache/mail-filter/spf-engine-2.9.2-r3
 2205011048 metadata/md5-cache/mail-filter/spf-engine-2.9.2-r4
-2205022240 metadata/md5-cache/mail-filter/Manifest.gz
 2205022240 metadata/md5-cache/mail-filter/couriersrs-0.1.2
 2205022240 metadata/md5-cache/mail-filter/procmail-3.22-r15
+2205071040 metadata/md5-cache/mail-filter/Manifest.gz
+2205071040 metadata/md5-cache/mail-filter/pyzor-1.0.0_p20211223
 2203252323 metadata/md5-cache/mail-mta/sendmail-8.16.1-r2
 2203252323 metadata/md5-cache/mail-mta/sendmail-8.17.1-r2
 2203282310 metadata/md5-cache/mail-mta/msmtp-1.8.16
@@ -50012,17 +50003,17 @@
 2204302241 metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.3-r2
 2204302241 metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.4-r2
 2205011048 metadata/md5-cache/media-fonts/liberation-fonts-2.1.2
-2205011048 metadata/md5-cache/media-fonts/liberation-fonts-2.1.3
 2205011048 metadata/md5-cache/media-fonts/noto-emoji-20210715
 2205011048 metadata/md5-cache/media-fonts/noto-emoji-20211101
 2205011048 metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3-r1
 2205011048 metadata/md5-cache/media-fonts/terminus-font-4.49.1
 2205021610 metadata/md5-cache/media-fonts/cascadia-code-2111.01
-2205051410 metadata/md5-cache/media-fonts/Manifest.gz
 2205051410 metadata/md5-cache/media-fonts/corefonts-1-r7
 2205051410 metadata/md5-cache/media-fonts/croscorefonts-1.31.0
 2205051410 metadata/md5-cache/media-fonts/noto-cjk-20190416
 2205051410 metadata/md5-cache/media-fonts/source-han-sans-1.004
+2205070740 metadata/md5-cache/media-fonts/Manifest.gz
+2205070740 metadata/md5-cache/media-fonts/liberation-fonts-2.1.3
 2107180709 metadata/md5-cache/media-gfx/album-4.15-r1
 2009111309 metadata/md5-cache/media-gfx/dpic-20200901
 2108140209 metadata/md5-cache/media-gfx/ebdftopcf-2-r1
@@ -50255,7 +50246,6 @@
 2204302241 metadata/md5-cache/media-gfx/graphicsmagick-9999
 2205011048 metadata/md5-cache/media-gfx/graphite2-1.3.14-r1
 2205011048 metadata/md5-cache/media-gfx/graphite2-1.3.14_p20210810
-2205011048 metadata/md5-cache/media-gfx/graphite2-1.3.14_p20210810-r1
 2205011048 metadata/md5-cache/media-gfx/gscan2pdf-2.12.4
 2205011048 metadata/md5-cache/media-gfx/gscan2pdf-2.12.5
 2205011048 metadata/md5-cache/media-gfx/gthumb-3.10.4
@@ -50386,9 +50376,12 @@
 2205022240 metadata/md5-cache/media-gfx/zbar-0.23.90
 2205040340 metadata/md5-cache/media-gfx/graphicsmagick-1.3.38
 2205041840 metadata/md5-cache/media-gfx/ttfautohint-1.8.4-r2
-2205051310 metadata/md5-cache/media-gfx/Manifest.gz
 2205050840 metadata/md5-cache/media-gfx/chafa-1.10.2
 2205050110 metadata/md5-cache/media-gfx/prusaslicer-2.4.2
+2205070840 metadata/md5-cache/media-gfx/Manifest.gz
+2205062240 metadata/md5-cache/media-gfx/chafa-1.10.3
+2205070740 metadata/md5-cache/media-gfx/graphite2-1.3.14_p20210810-r1
+2205070840 metadata/md5-cache/media-gfx/krita-5.0.6-r1
 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
@@ -50491,7 +50484,6 @@
 2203252323 metadata/md5-cache/media-libs/libopenmpt-0.5.14
 2203252323 metadata/md5-cache/media-libs/libopenraw-0.1.3
 2203251709 metadata/md5-cache/media-libs/libpagemaker-0.0.4
-2203252323 metadata/md5-cache/media-libs/libpng-1.6.37-r2
 2203252323 metadata/md5-cache/media-libs/libpng-compat-1.2.59
 2203252323 metadata/md5-cache/media-libs/libpng-compat-1.5.30
 2203252323 metadata/md5-cache/media-libs/libquicktime-1.2.4-r3
@@ -50614,7 +50606,6 @@
 2204302241 metadata/md5-cache/media-libs/fluidsynth-dssi-1.0.0-r1
 2204302241 metadata/md5-cache/media-libs/fontconfig-2.13.1-r2
 2204302241 metadata/md5-cache/media-libs/fontconfig-2.13.93
-2204302241 metadata/md5-cache/media-libs/fontconfig-2.14.0-r1
 2204302241 metadata/md5-cache/media-libs/freealut-1.1.0-r4
 2205011048 metadata/md5-cache/media-libs/freeglut-3.2.1-r2
 2205011048 metadata/md5-cache/media-libs/freeglut-3.2.2
@@ -50671,7 +50662,6 @@
 2205011048 metadata/md5-cache/media-libs/harfbuzz-3.2.0
 2205011048 metadata/md5-cache/media-libs/harfbuzz-4.1.0
 2205011048 metadata/md5-cache/media-libs/harfbuzz-4.2.0
-2205011048 metadata/md5-cache/media-libs/harfbuzz-4.2.1
 2205011048 metadata/md5-cache/media-libs/harfbuzz-9999
 2205011048 metadata/md5-cache/media-libs/ilmbase-2.5.7-r2
 2205011048 metadata/md5-cache/media-libs/ilmbase-2.5.7-r3
@@ -50832,12 +50822,6 @@
 2204302241 metadata/md5-cache/media-libs/libzmf-9999
 2205011048 metadata/md5-cache/media-libs/lilv-0.24.12
 2205011048 metadata/md5-cache/media-libs/lvtk-1.2.0-r1
-2205011048 metadata/md5-cache/media-libs/mesa-21.3.7
-2205011048 metadata/md5-cache/media-libs/mesa-21.3.8
-2205011048 metadata/md5-cache/media-libs/mesa-22.0.0
-2205011048 metadata/md5-cache/media-libs/mesa-22.0.1
-2205011048 metadata/md5-cache/media-libs/mesa-22.0.2
-2205011048 metadata/md5-cache/media-libs/mesa-22.1.0_rc3
 2205011048 metadata/md5-cache/media-libs/mlt-7.4.0
 2205011048 metadata/md5-cache/media-libs/mlt-7.6.0
 2205011048 metadata/md5-cache/media-libs/munt-mt32emu-2.6.3
@@ -50856,7 +50840,6 @@
 2205011048 metadata/md5-cache/media-libs/opencolorio-2.0.1-r2
 2205011048 metadata/md5-cache/media-libs/opencolorio-2.0.3
 2205011048 metadata/md5-cache/media-libs/opencolorio-2.1.1-r2
-2205011048 metadata/md5-cache/media-libs/opencolorio-2.1.1-r7
 2205011048 metadata/md5-cache/media-libs/openexr-2.5.7
 2205011048 metadata/md5-cache/media-libs/openexr-2.5.8
 2205011048 metadata/md5-cache/media-libs/openexr-3.1.4-r1
@@ -50966,7 +50949,6 @@
 2204302241 metadata/md5-cache/media-libs/zimg-9999
 2205011048 metadata/md5-cache/media-libs/zmusic-1.1.4
 2205011048 metadata/md5-cache/media-libs/zxing-cpp-1.2.0
-2205012140 metadata/md5-cache/media-libs/freetype-2.12.1
 2205012040 metadata/md5-cache/media-libs/lv2-1.18.2
 2205021010 metadata/md5-cache/media-libs/fcft-3.1.1
 2205020310 metadata/md5-cache/media-libs/harfbuzz-3.4.0-r1
@@ -51020,8 +51002,18 @@
 2205040710 metadata/md5-cache/media-libs/libsndfile-1.1.0-r1
 2205031840 metadata/md5-cache/media-libs/mesa-9999
 2205051310 metadata/md5-cache/media-libs/xine-lib-1.2.12-r1
-2205060940 metadata/md5-cache/media-libs/Manifest.gz
 2205052340 metadata/md5-cache/media-libs/chromaprint-1.5.1-r2
+2205071040 metadata/md5-cache/media-libs/Manifest.gz
+2205070740 metadata/md5-cache/media-libs/fontconfig-2.14.0-r1
+2205070740 metadata/md5-cache/media-libs/freetype-2.12.1
+2205070740 metadata/md5-cache/media-libs/harfbuzz-4.2.1
+2205071040 metadata/md5-cache/media-libs/libid3tag-0.16.2
+2205070740 metadata/md5-cache/media-libs/libpng-1.6.37-r2
+2205062010 metadata/md5-cache/media-libs/mesa-21.3.8
+2205062010 metadata/md5-cache/media-libs/mesa-22.0.3
+2205062010 metadata/md5-cache/media-libs/mesa-22.1.0_rc4
+2205071040 metadata/md5-cache/media-libs/opencolorio-2.1.1-r7
+2205071040 metadata/md5-cache/media-libs/openimageio-2.3.15.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
@@ -52203,9 +52195,13 @@
 2205051310 metadata/md5-cache/media-sound/sonic-visualiser-4.5
 2205051310 metadata/md5-cache/media-sound/vmpk-0.8.7
 2205051310 metadata/md5-cache/media-sound/wavbreaker-0.15
-2205060940 metadata/md5-cache/media-sound/Manifest.gz
 2205052340 metadata/md5-cache/media-sound/fluidsynth-2.2.6
 2205052340 metadata/md5-cache/media-sound/quodlibet-4.5.0
+2205071110 metadata/md5-cache/media-sound/Manifest.gz
+2205071040 metadata/md5-cache/media-sound/abcmidi-2022.05.05
+2205071040 metadata/md5-cache/media-sound/aeolus-0.10.1
+2205071040 metadata/md5-cache/media-sound/frescobaldi-3.2
+2205071110 metadata/md5-cache/media-sound/schismtracker-20220506
 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
@@ -52879,7 +52875,6 @@
 2205022240 metadata/md5-cache/net-analyzer/zabbix-5.0.22
 2205022240 metadata/md5-cache/net-analyzer/zabbix-5.4.10-r2
 2205022240 metadata/md5-cache/net-analyzer/zabbix-5.4.12
-2205022240 metadata/md5-cache/net-analyzer/zabbix-6.0.2-r1
 2205022240 metadata/md5-cache/net-analyzer/zabbix-6.0.3
 2205040740 metadata/md5-cache/net-analyzer/darkstat-3.0.719-r4
 2205040740 metadata/md5-cache/net-analyzer/darkstat-9999999
@@ -52887,8 +52882,8 @@
 2205032140 metadata/md5-cache/net-analyzer/monitoring-plugins-2.3.1-r3
 2205050440 metadata/md5-cache/net-analyzer/darkstat-3.0.721-r1
 2205051310 metadata/md5-cache/net-analyzer/wireshark-3.6.3
-2205061440 metadata/md5-cache/net-analyzer/Manifest.gz
 2205061440 metadata/md5-cache/net-analyzer/rrdtool-1.8.0
+2205071040 metadata/md5-cache/net-analyzer/Manifest.gz
 1704281609 metadata/md5-cache/net-dialup/dial-1.2-r2
 2106122209 metadata/md5-cache/net-dialup/ppp-scripts-0
 2104161439 metadata/md5-cache/net-dialup/sercd-3.0.0-r2
@@ -52915,7 +52910,6 @@
 2205011048 metadata/md5-cache/net-dialup/freeradius-3.0.20-r5
 2205011048 metadata/md5-cache/net-dialup/freeradius-3.0.21-r5
 2205011048 metadata/md5-cache/net-dialup/freeradius-3.0.22-r4
-2205011048 metadata/md5-cache/net-dialup/freeradius-3.0.25-r2
 2204302241 metadata/md5-cache/net-dialup/freeradius-client-1.1.7-r2
 2204302241 metadata/md5-cache/net-dialup/linux-atm-2.5.2-r1
 2204302241 metadata/md5-cache/net-dialup/lrzsz-0.12.20-r4
@@ -52928,8 +52922,9 @@
 2204302241 metadata/md5-cache/net-dialup/rp-pppoe-3.15-r2
 2205011048 metadata/md5-cache/net-dialup/sendpage-1.1.0-r4
 2205022240 metadata/md5-cache/net-dialup/minicom-2.7.1
-2205051210 metadata/md5-cache/net-dialup/Manifest.gz
 2205051210 metadata/md5-cache/net-dialup/ppp-2.4.9-r6
+2205062110 metadata/md5-cache/net-dialup/Manifest.gz
+2205062110 metadata/md5-cache/net-dialup/freeradius-3.0.25-r2
 1910111739 metadata/md5-cache/net-dns/dnscap-1.10.3
 2101061809 metadata/md5-cache/net-dns/dnswalk-2.0.2
 2105311239 metadata/md5-cache/net-dns/idnkit-2.3
@@ -53157,7 +53152,6 @@
 2204151540 metadata/md5-cache/net-im/teams-1.4.00.7556-r1
 2204171810 metadata/md5-cache/net-im/prosody-0.12.0
 2204191609 metadata/md5-cache/net-im/teams-1.5.00.10453
-2204291140 metadata/md5-cache/net-im/signal-desktop-bin-5.41.0
 2204271640 metadata/md5-cache/net-im/telegram-desktop-bin-3.7.3
 2204272010 metadata/md5-cache/net-im/zoom-5.10.4.2845-r1
 2205011048 metadata/md5-cache/net-im/biboumi-9.0-r4
@@ -53213,8 +53207,9 @@
 2205022240 metadata/md5-cache/net-im/bitlbee-steam-9999
 2205022240 metadata/md5-cache/net-im/empathy-3.12.14
 2205031010 metadata/md5-cache/net-im/profanity-0.12.1-r1
-2205061540 metadata/md5-cache/net-im/Manifest.gz
 2205061540 metadata/md5-cache/net-im/element-desktop-bin-1.10.11
+2205070840 metadata/md5-cache/net-im/Manifest.gz
+2205070840 metadata/md5-cache/net-im/signal-desktop-bin-5.42.0
 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
@@ -54109,7 +54104,6 @@
 2205011048 metadata/md5-cache/net-misc/gallery-dl-1.21.1
 2205011048 metadata/md5-cache/net-misc/gallery-dl-1.21.2
 2205011048 metadata/md5-cache/net-misc/gallery-dl-9999
-2205011048 metadata/md5-cache/net-misc/gerbera-1.10.0
 2205011048 metadata/md5-cache/net-misc/gerbera-9999
 2205011048 metadata/md5-cache/net-misc/gnome-remote-desktop-41.2
 2205011048 metadata/md5-cache/net-misc/gnome-remote-desktop-42.0
@@ -54310,10 +54304,11 @@
 2205050240 metadata/md5-cache/net-misc/netopeer2-2.1.16
 2205050240 metadata/md5-cache/net-misc/sysrepo-2.1.42
 2205051340 metadata/md5-cache/net-misc/vde-2.3.2_p20191011-r1
-2205061640 metadata/md5-cache/net-misc/Manifest.gz
 2205061210 metadata/md5-cache/net-misc/bridge-utils-1.7.1-r1
 2205061440 metadata/md5-cache/net-misc/minidlna-1.3.1
 2205061140 metadata/md5-cache/net-misc/openssh-8.9_p1-r2
+2205070840 metadata/md5-cache/net-misc/Manifest.gz
+2205070840 metadata/md5-cache/net-misc/gerbera-1.11.0
 1911091712 metadata/md5-cache/net-nds/led-1.111
 2203040040 metadata/md5-cache/net-nds/gssproxy-0.8.4-r2
 2203252323 metadata/md5-cache/net-nds/rpcbind-1.2.6
@@ -54540,7 +54535,6 @@
 2204261840 metadata/md5-cache/net-proxy/haproxy-2.5.6
 2204261840 metadata/md5-cache/net-proxy/haproxy-2.5.9999
 2204261840 metadata/md5-cache/net-proxy/haproxy-9999
-2204302241 metadata/md5-cache/net-proxy/dante-1.4.1-r6
 2205011048 metadata/md5-cache/net-proxy/hatop-0.8.0
 2205011048 metadata/md5-cache/net-proxy/hatop-0.8.1
 2204302241 metadata/md5-cache/net-proxy/havp-0.92a-r3
@@ -54564,8 +54558,9 @@
 2205022240 metadata/md5-cache/net-proxy/tayga-0.9.2-r3
 2205022240 metadata/md5-cache/net-proxy/torsocks-2.2.0
 2205052010 metadata/md5-cache/net-proxy/squid-4.17-r1
-2205061910 metadata/md5-cache/net-proxy/Manifest.gz
 2205061910 metadata/md5-cache/net-proxy/haproxy-2.2.23
+2205070740 metadata/md5-cache/net-proxy/Manifest.gz
+2205070740 metadata/md5-cache/net-proxy/dante-1.4.1-r6
 2204302241 metadata/md5-cache/net-voip/captagent-6.3.1-r1
 2205011048 metadata/md5-cache/net-voip/sipvicious-0.3.4
 2205011048 metadata/md5-cache/net-voip/telepathy-rakia-0.8.0-r1
@@ -54635,7 +54630,6 @@
 2204302241 metadata/md5-cache/net-vpn/pptpd-1.4.0-r3
 2205011048 metadata/md5-cache/net-vpn/protonvpn-cli-2.2.11-r1
 2205011048 metadata/md5-cache/net-vpn/riseup-vpn-0.21.11
-2205011048 metadata/md5-cache/net-vpn/tor-0.4.6.10
 2205011048 metadata/md5-cache/net-vpn/vpncloud-2.3.0
 2205020210 metadata/md5-cache/net-vpn/headscale-0.15.0-r1
 2205022240 metadata/md5-cache/net-vpn/i2p-0.9.50
@@ -54648,9 +54642,10 @@
 2205051340 metadata/md5-cache/net-vpn/tinc-1.0.36
 2205051340 metadata/md5-cache/net-vpn/tinc-1.1_pre18
 2205051310 metadata/md5-cache/net-vpn/wireguard-tools-1.0.20210914
-2205061310 metadata/md5-cache/net-vpn/Manifest.gz
 2205061310 metadata/md5-cache/net-vpn/strongswan-5.9.6
-2205060410 metadata/md5-cache/net-vpn/tor-0.4.7.7
+2205071040 metadata/md5-cache/net-vpn/Manifest.gz
+2205071040 metadata/md5-cache/net-vpn/tor-0.4.6.10
+2205071040 metadata/md5-cache/net-vpn/tor-0.4.7.7
 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
@@ -57496,8 +57491,6 @@
 2204302241 metadata/md5-cache/sys-apps/hwloc-2.6.0
 2204302241 metadata/md5-cache/sys-apps/hwloc-2.7.1-r1
 2205011048 metadata/md5-cache/sys-apps/i2c-tools-4.1-r1
-2205011048 metadata/md5-cache/sys-apps/i2c-tools-4.2
-2205011048 metadata/md5-cache/sys-apps/i2c-tools-4.3
 2204302241 metadata/md5-cache/sys-apps/ibm-powerpc-utils-1.3.8-r1
 2204302241 metadata/md5-cache/sys-apps/ibm-powerpc-utils-99999
 2204302241 metadata/md5-cache/sys-apps/ipmitool-1.8.18_p20201004-r2
@@ -57640,13 +57633,16 @@
 2205051310 metadata/md5-cache/sys-apps/smartmontools-7.3
 2205051310 metadata/md5-cache/sys-apps/smartmontools-9999
 2205050610 metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r18
-2205061210 metadata/md5-cache/sys-apps/Manifest.gz
 2205060310 metadata/md5-cache/sys-apps/ed-1.18
 2205060310 metadata/md5-cache/sys-apps/fakeroot-1.28
 2205061110 metadata/md5-cache/sys-apps/ipmiutil-3.1.8
 2205060310 metadata/md5-cache/sys-apps/pcsc-lite-1.9.5
-2205060512 metadata/md5-cache/sys-apps/systemd-9999
 2205061210 metadata/md5-cache/sys-apps/utempter-0.5.5.6-r1
+2205071040 metadata/md5-cache/sys-apps/Manifest.gz
+2205071040 metadata/md5-cache/sys-apps/i2c-tools-4.2
+2205071040 metadata/md5-cache/sys-apps/i2c-tools-4.3
+2205062140 metadata/md5-cache/sys-apps/systemd-9999
+2205070840 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
 2104292039 metadata/md5-cache/sys-auth/pam_mount-2.16-r3
@@ -58112,8 +58108,6 @@
 2204250340 metadata/md5-cache/sys-devel/gcc-11.2.0
 2204250340 metadata/md5-cache/sys-devel/gcc-11.2.1_p20220115
 2204250340 metadata/md5-cache/sys-devel/gcc-11.3.0
-2204250340 metadata/md5-cache/sys-devel/gcc-11.3.1_pre9999
-2204282310 metadata/md5-cache/sys-devel/gcc-12.0.0_pre9999
 2204282310 metadata/md5-cache/sys-devel/gcc-13.0.0_pre9999
 2204250340 metadata/md5-cache/sys-devel/gcc-6.5.0-r4
 2204250340 metadata/md5-cache/sys-devel/gcc-7.5.0-r2
@@ -58134,7 +58128,6 @@
 2204290940 metadata/md5-cache/sys-devel/make-4.3
 2204290540 metadata/md5-cache/sys-devel/patch-2.7.6-r4
 2204301040 metadata/md5-cache/sys-devel/clang-runtime-14.0.3
-2204292140 metadata/md5-cache/sys-devel/gcc-12.0.1_pre20220429
 2204301010 metadata/md5-cache/sys-devel/mold-1.2.1-r1
 2204301010 metadata/md5-cache/sys-devel/mold-9999
 2205011048 metadata/md5-cache/sys-devel/automake-1.16.3-r1
@@ -58191,7 +58184,6 @@
 2205011048 metadata/md5-cache/sys-devel/llvm-roc-5.0.2
 2204302241 metadata/md5-cache/sys-devel/parity-9999
 2205011048 metadata/md5-cache/sys-devel/rust-std-1.58.1
-2205020740 metadata/md5-cache/sys-devel/gcc-12.0.1_pre20220430
 2205020040 metadata/md5-cache/sys-devel/gdb-9999
 2205022240 metadata/md5-cache/sys-devel/bc-1.07.1-r3
 2205022240 metadata/md5-cache/sys-devel/binutils-apple-3.2.6
@@ -58202,7 +58194,10 @@
 2205022240 metadata/md5-cache/sys-devel/native-cctools-4
 2205022240 metadata/md5-cache/sys-devel/native-cctools-5
 2205041140 metadata/md5-cache/sys-devel/autogen-5.18.16-r1
-2205050240 metadata/md5-cache/sys-devel/Manifest.gz
+2205070540 metadata/md5-cache/sys-devel/Manifest.gz
+2205070540 metadata/md5-cache/sys-devel/gcc-11.3.1_pre9999
+2205070540 metadata/md5-cache/sys-devel/gcc-12.1.0
+2205070540 metadata/md5-cache/sys-devel/gcc-12.1.1_pre9999
 2204302241 metadata/md5-cache/sys-fabric/Manifest.gz
 2204302241 metadata/md5-cache/sys-fabric/mstflint-4.18.0_p1-r1
 2204302241 metadata/md5-cache/sys-fabric/opensm-3.3.23-r1
@@ -58292,7 +58287,6 @@
 2106110009 metadata/md5-cache/sys-fs/static-dev-0.1-r2
 2104060140 metadata/md5-cache/sys-fs/udev-init-scripts-34
 2109280109 metadata/md5-cache/sys-fs/udftools-2.3
-2104131409 metadata/md5-cache/sys-fs/xwmfs-0.90
 2202120009 metadata/md5-cache/sys-fs/mtd-utils-2.1.4
 2203230339 metadata/md5-cache/sys-fs/ldapfuse-1.0-r4
 2203240726 metadata/md5-cache/sys-fs/udev-init-scripts-9999
@@ -58470,12 +58464,13 @@
 2205051310 metadata/md5-cache/sys-fs/ubi_reader-0.8.0
 2205051040 metadata/md5-cache/sys-fs/zfs-2.1.4
 2205051040 metadata/md5-cache/sys-fs/zfs-kmod-2.1.4-r1
-2205061210 metadata/md5-cache/sys-fs/Manifest.gz
 2205060310 metadata/md5-cache/sys-fs/btrfs-progs-5.17
 2205061210 metadata/md5-cache/sys-fs/mtools-4.0.39
 2205060310 metadata/md5-cache/sys-fs/reiser4progs-2.0.5
 2205060310 metadata/md5-cache/sys-fs/reiserfsprogs-3.6.27-r1
 2205060310 metadata/md5-cache/sys-fs/xfsprogs-5.16.0
+2205070810 metadata/md5-cache/sys-fs/Manifest.gz
+2205070810 metadata/md5-cache/sys-fs/xwmfs-0.91
 2106161909 metadata/md5-cache/sys-kernel/installkernel-gentoo-3
 2106270109 metadata/md5-cache/sys-kernel/installkernel-systemd-boot-1
 2112140909 metadata/md5-cache/sys-kernel/raspberrypi-image-4.14.98_p20190215
@@ -58684,7 +58679,6 @@
 2204110709 metadata/md5-cache/sys-libs/libsepol-9999
 2204150910 metadata/md5-cache/sys-libs/pwdb-0.62-r2
 2204151640 metadata/md5-cache/sys-libs/libstatgrab-0.92
-2204162140 metadata/md5-cache/sys-libs/binutils-libs-2.38-r2
 2204230540 metadata/md5-cache/sys-libs/musl-1.2.2-r7
 2204230540 metadata/md5-cache/sys-libs/musl-1.2.2-r8
 2204230540 metadata/md5-cache/sys-libs/musl-1.2.3
@@ -58741,7 +58735,6 @@
 2205011048 metadata/md5-cache/sys-libs/libcxxabi-14.0.1
 2205011048 metadata/md5-cache/sys-libs/libcxxabi-14.0.3
 2205011048 metadata/md5-cache/sys-libs/libcxxabi-15.0.0.9999
-2205011048 metadata/md5-cache/sys-libs/libhugetlbfs-2.23
 2204302241 metadata/md5-cache/sys-libs/libhx-3.24-r1
 2204302241 metadata/md5-cache/sys-libs/libhx-3.25
 2204302241 metadata/md5-cache/sys-libs/libieee1284-0.2.11-r8
@@ -58767,7 +58760,6 @@
 2204302241 metadata/md5-cache/sys-libs/libvpd-2.2.8-r1
 2205011048 metadata/md5-cache/sys-libs/libxcrypt-4.4.20
 2205011048 metadata/md5-cache/sys-libs/libxcrypt-4.4.27
-2205011048 metadata/md5-cache/sys-libs/libxcrypt-4.4.28
 2205011048 metadata/md5-cache/sys-libs/llvm-libunwind-12.0.1
 2205011048 metadata/md5-cache/sys-libs/llvm-libunwind-13.0.1
 2205011048 metadata/md5-cache/sys-libs/llvm-libunwind-14.0.1
@@ -58819,11 +58811,14 @@
 2205051310 metadata/md5-cache/sys-libs/libcap-ng-0.8.3
 2205050511 metadata/md5-cache/sys-libs/libucontext-1.2
 2205051310 metadata/md5-cache/sys-libs/libutempter-1.2.1
-2205060310 metadata/md5-cache/sys-libs/Manifest.gz
 2205060010 metadata/md5-cache/sys-libs/compiler-rt-15.0.0.9999
 2205060010 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.0.9999
 2205052310 metadata/md5-cache/sys-libs/ldb-2.3.3
 2205060310 metadata/md5-cache/sys-libs/libaal-1.0.7-r2
+2205071040 metadata/md5-cache/sys-libs/Manifest.gz
+2205070740 metadata/md5-cache/sys-libs/binutils-libs-2.38-r2
+2205071040 metadata/md5-cache/sys-libs/libhugetlbfs-2.23
+2205070810 metadata/md5-cache/sys-libs/libxcrypt-4.4.28
 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
@@ -59039,7 +59034,6 @@
 2204180941 metadata/md5-cache/virtual/rubygems-17
 2204202039 metadata/md5-cache/virtual/dist-kernel-5.4.190
 2204202009 metadata/md5-cache/virtual/rust-1.59.0
-2204222110 metadata/md5-cache/virtual/perl-IO-Compress-2.103.0-r1
 2204240540 metadata/md5-cache/virtual/dist-kernel-5.10.112
 2204240540 metadata/md5-cache/virtual/dist-kernel-5.15.35
 2204240540 metadata/md5-cache/virtual/dist-kernel-5.17.4
@@ -59168,9 +59162,10 @@
 2205041040 metadata/md5-cache/virtual/libusb-1-r2
 2205051340 metadata/md5-cache/virtual/logger-0-r1
 2205050610 metadata/md5-cache/virtual/mta-1-r2
-2205060310 metadata/md5-cache/virtual/Manifest.gz
 2205060310 metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.103.0-r1
 2205060310 metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.103.0-r1
+2205070740 metadata/md5-cache/virtual/Manifest.gz
+2205070740 metadata/md5-cache/virtual/perl-IO-Compress-2.103.0-r1
 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
@@ -59262,8 +59257,6 @@
 2203282310 metadata/md5-cache/www-apps/dokuwiki-20180422b
 2203282310 metadata/md5-cache/www-apps/dokuwiki-20200729
 2203282310 metadata/md5-cache/www-apps/dotproject-2.1.7-r2
-2203282310 metadata/md5-cache/www-apps/element-1.10.7
-2203282310 metadata/md5-cache/www-apps/element-1.10.8
 2203282310 metadata/md5-cache/www-apps/mirmon-2.11-r2
 2203282310 metadata/md5-cache/www-apps/moodle-3.10.10
 2203282310 metadata/md5-cache/www-apps/moodle-3.11.6
@@ -59360,9 +59353,11 @@
 2205050810 metadata/md5-cache/www-apps/grafana-bin-8.4.7
 2205050810 metadata/md5-cache/www-apps/grafana-bin-8.5.2
 2205050740 metadata/md5-cache/www-apps/hugo-0.98.0
-2205061310 metadata/md5-cache/www-apps/Manifest.gz
 2205061310 metadata/md5-cache/www-apps/chromedriver-bin-101.0.4951.41
 2205061110 metadata/md5-cache/www-apps/gitea-1.16.7
+2205062340 metadata/md5-cache/www-apps/Manifest.gz
+2205062340 metadata/md5-cache/www-apps/element-1.10.11
+2205062240 metadata/md5-cache/www-apps/miniflux-2.0.36
 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
@@ -59377,15 +59372,11 @@
 2203260340 metadata/md5-cache/www-client/w3mmee-0.3.2_p24-r12
 2204151540 metadata/md5-cache/www-client/opera-beta-86.0.4363.17
 2204151540 metadata/md5-cache/www-client/opera-developer-87.0.4388.0
-2204151710 metadata/md5-cache/www-client/chromium-bin-100.0.4896.127
-2204152240 metadata/md5-cache/www-client/microsoft-edge-dev-102.0.1224.0
 2204280110 metadata/md5-cache/www-client/vivaldi-snapshot-5.3.2656.3
 2204301240 metadata/md5-cache/www-client/vivaldi-5.2.2623.39
 2204301240 metadata/md5-cache/www-client/vivaldi-5.2.2623.41
 2204301240 metadata/md5-cache/www-client/vivaldi-snapshot-5.3.2658.3
 2205011048 metadata/md5-cache/www-client/chromium-100.0.4896.127
-2205011048 metadata/md5-cache/www-client/chromium-101.0.4951.34
-2205011048 metadata/md5-cache/www-client/chromium-102.0.4997.0
 2204302241 metadata/md5-cache/www-client/dillo-3.0.5-r3
 2204302241 metadata/md5-cache/www-client/dillo-3.1_pre20181005
 2204302241 metadata/md5-cache/www-client/dillo-9999
@@ -59430,8 +59421,6 @@
 2205032040 metadata/md5-cache/www-client/microsoft-edge-dev-102.0.1227.0
 2205032040 metadata/md5-cache/www-client/microsoft-edge-dev-102.0.1235.1
 2205051740 metadata/md5-cache/www-client/firefox-91.9.0
-2205061340 metadata/md5-cache/www-client/Manifest.gz
-2205060410 metadata/md5-cache/www-client/chromium-101.0.4951.54
 2205061340 metadata/md5-cache/www-client/firefox-100.0
 2205061310 metadata/md5-cache/www-client/google-chrome-beta-102.0.5005.40
 2205061310 metadata/md5-cache/www-client/google-chrome-unstable-103.0.5042.0
@@ -59442,6 +59431,12 @@
 2205061310 metadata/md5-cache/www-client/opera-beta-87.0.4390.8
 2205061310 metadata/md5-cache/www-client/opera-developer-88.0.4395.0
 2205061310 metadata/md5-cache/www-client/opera-developer-88.0.4401.0
+2205062210 metadata/md5-cache/www-client/Manifest.gz
+2205062040 metadata/md5-cache/www-client/chromium-101.0.4951.54
+2205062140 metadata/md5-cache/www-client/chromium-102.0.5005.40
+2205062140 metadata/md5-cache/www-client/chromium-103.0.5042.0
+2205062210 metadata/md5-cache/www-client/chromium-bin-101.0.4951.54
+2205062210 metadata/md5-cache/www-client/microsoft-edge-dev-102.0.1245.3
 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
@@ -59756,8 +59751,6 @@
 2204101910 metadata/md5-cache/x11-libs/gnome-pty-helper-0.40.2-r1
 2204301910 metadata/md5-cache/x11-libs/qwt-6.2.0-r1
 2204302241 metadata/md5-cache/x11-libs/agg-2.5-r3
-2204302241 metadata/md5-cache/x11-libs/cairo-1.16.0-r5
-2204302241 metadata/md5-cache/x11-libs/cairo-9999
 2205011048 metadata/md5-cache/x11-libs/colord-gtk-0.2.0
 2205011048 metadata/md5-cache/x11-libs/colord-gtk-0.3.0
 2204302241 metadata/md5-cache/x11-libs/fltk-1.3.5-r4
@@ -59856,8 +59849,6 @@
 2205011048 metadata/md5-cache/x11-libs/pango-1.50.5
 2205011048 metadata/md5-cache/x11-libs/pango-1.50.6
 2205011048 metadata/md5-cache/x11-libs/pango-1.50.7
-2205011048 metadata/md5-cache/x11-libs/pixman-0.40.0
-2205011048 metadata/md5-cache/x11-libs/pixman-9999
 2205011048 metadata/md5-cache/x11-libs/qtermwidget-0.17.0
 2205011048 metadata/md5-cache/x11-libs/qtermwidget-1.0.0
 2205011048 metadata/md5-cache/x11-libs/qtermwidget-9999
@@ -59895,8 +59886,12 @@
 2205032210 metadata/md5-cache/x11-libs/libnotify-0.7.11
 2205040140 metadata/md5-cache/x11-libs/libxcb-1.15
 2205050610 metadata/md5-cache/x11-libs/xapp-2.2.8
-2205060110 metadata/md5-cache/x11-libs/Manifest.gz
 2205060110 metadata/md5-cache/x11-libs/libnotify-0.7.12
+2205070740 metadata/md5-cache/x11-libs/Manifest.gz
+2205070740 metadata/md5-cache/x11-libs/cairo-1.16.0-r5
+2205070740 metadata/md5-cache/x11-libs/cairo-9999
+2205070740 metadata/md5-cache/x11-libs/pixman-0.40.0
+2205070740 metadata/md5-cache/x11-libs/pixman-9999
 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
@@ -60798,8 +60793,9 @@
 2205022240 metadata/md5-cache/x11-wm/stumpwm-contrib-20180128
 2205022240 metadata/md5-cache/x11-wm/stumpwm-contrib-99999999
 2205022240 metadata/md5-cache/x11-wm/xmonad-0.15
-2205050610 metadata/md5-cache/x11-wm/Manifest.gz
 2205050610 metadata/md5-cache/x11-wm/muffin-5.2.0
+2205070610 metadata/md5-cache/x11-wm/Manifest.gz
+2205070610 metadata/md5-cache/x11-wm/mutter-42.1
 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
@@ -61040,4 +61036,4 @@
 2204291439 metadata/md5-cache/sec-keys/signify-keys-signify-30
 2205041140 metadata/md5-cache/sec-keys/Manifest.gz
 2205041140 metadata/md5-cache/sec-keys/openpgp-keys-danielstenberg-20220330
-2205061910 metadata/md5-cache/Manifest.gz
+2205071110 metadata/md5-cache/Manifest.gz
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 7f95d7e23377..a05d77b600b6 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 06 May 2022 16:30:01 +0000
+Sat, 07 May 2022 08:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 8ad98cf9eb0d..1672bf7ee1e2 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-a71dfea8dd4d6e86ea4c288fe614ddbfad71bfb6 1651851477 2022-05-06T15:37:57+00:00
+20f9533cdd645682b48f29e0296ae9384423ad1b 1651909546 2022-05-07T07:45:46+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index fcdc08eca7a3..06fa0d15cd38 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1651853401 Fri 06 May 2022 04:10:01 PM UTC
+1651911001 Sat 07 May 2022 08:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 3c3b271e0e15..4ebf16f67793 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 06 May 2022 16:09:42 +0000
+Sat, 07 May 2022 08:09:43 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index a833389d2a37..71f830eba2b3 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index 5f4f90a5d9f8..9e640811acc2 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -1,4 +1,3 @@
-AUX vnstat-2.2-run.patch 297 BLAKE2B 120045cff99c18d9be8e8a1655f8f043906c2c77563f139973f049c55d8b4c56558f2c47f973e036cb2c5071aafc24e6a6881dc1e13e196fd095ceb20677ff94 SHA512 c1e01bc7e71b56ac958c8071400f6f82c312a5f157333a3298596b85011dab5beb65b8dbc51a5f62aed68b56562266f7306e1cef82a69664b7486b148814db43
 AUX vnstat-2.9-conf.patch 1216 BLAKE2B 2d0ead56c02b4f28dc0f005f5b17276cd7ddc863ed55a0e8f19aba49cf3c3c5b55e226ebc764b8935a60e63dca75285eb74872966d9061e63c1d0731922e7faa SHA512 a99f5ab282054db944047022fd6239dc7043cbf00f19982b82d295b8f9d59efe4096815dc25271e3ecf582a5284587871a12b85b620201da2fdd5400395ae202
 AUX vnstat.cron-r1 177 BLAKE2B 1f015b8db93decce2877ce3c431cbc14c9bb2dd798f0762e5a7fb98d1c42e59e9839ecb6feb25312320cc2fb6b1aecd9b97323a6318a10a4426146c07094f2ae SHA512 8074d65cf2f28bd5c02fe741dbe20f8404bc2e25b94b43d0bcc829ca088828227805caf9cb8cae020ae0a9370d68dc3c757fedf07d48c0fc71ba944f2da1cb94
 AUX vnstatd.confd-r1 569 BLAKE2B 8f30a05a587477d8c76f97542017aece78ef3c69a608e97ec6f6bc9a80e295d7b2cab16cc1e15d6c3166594d4e21509e40222107662a7c10c09b946ca43da24e SHA512 2d5370623ac886e424380100474506b6c2076bfb522fd8ead789af41aeb89b7f3f23c6aa85520d7cc84a53d36926a433b631b5bafe837c9ad04ba04dd7e11553
diff --git a/net-analyzer/vnstat/files/vnstat-2.2-run.patch b/net-analyzer/vnstat/files/vnstat-2.2-run.patch
deleted file mode 100644
index bb9222b5fe2f..000000000000
--- a/net-analyzer/vnstat/files/vnstat-2.2-run.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/common.h
-+++ b/src/common.h
-@@ -229,7 +229,7 @@
- #define CREATEDIRS 1
- #define UPDATEFILEOWNER 1
- #define LOGFILE "/var/log/vnstat/vnstat.log"
--#define PIDFILE "/var/run/vnstat/vnstat.pid"
-+#define PIDFILE "/run/vnstat/vnstat.pid"
- #define IS64BIT -2
- 
- /* no transparency by default */
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index e0ee55113bdf..76ae04f3bf52 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -20,8 +20,6 @@ AUX zabbix-server.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5c
 DIST github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c69.mod 36 BLAKE2B c4bd514ce347b1cef3c84d6a9b0c50c30f627ec96a01b083c240770618fc6ec4a66d73aef4dd3f40426fcce60be02a6fb620c023c56f88930925e71a4b842a83 SHA512 1d855074be6ecc48804f3d70d54a92617864fbcdade80deee03fe29f046d05901628bfe11c37a30838177801aa2bdb8247b7a8ad18bdd4d1d3a2d85d3342b304
 DIST github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c69.zip 3289 BLAKE2B 9ee2622ac02197b10ee4798bba13513b6cbd319827ec14688f5950de6d8784813397155694e54ef756ead56791a669a61c190c4d3adbe4bf9795ead4896dcfb4 SHA512 953c2b7b855a5798948b52e82c7cae799b9310ca5978bf3168fdce310b6695647f997c7a9d70e7156870977be2de26479865980acfa36d765bd21fb4fe823bba
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
-DIST github.com%2Fcakturk%2Fgo-netstat%2F@v%2Fv0.0.0-20200220111822-e5b49efee7a5.mod 46 BLAKE2B 4c69af06863f7fad07d58c25d89f88b2b5f6f86b0d23244b1613eac55b086fe8c0e68f9c71c258c52223f4a011632a9ed6514be85b9761d278141b6dae229087 SHA512 6bdec112be0531feae4b7704dfbe6e757eea511d3ee8af973972496d069d9c6b101babfef868a4df80c4b471cbf91a9b716ba46a164ca946db1fd10ac44623bc
-DIST github.com%2Fcakturk%2Fgo-netstat%2F@v%2Fv0.0.0-20200220111822-e5b49efee7a5.zip 10079 BLAKE2B 0d4395568b3659dbe1241f53aa840075b803f99eeb73a1bd775769d671420007e9864986f3dfea0527ceac03a55ecc9b23dcb6367dcf31c75467aee1c37ebb7c SHA512 726a19c1e7a26746e54ec0ba5b20741d6c95f46ec29fcdc3adbc687116ebfa42c0cf114a5adcd4025da4c1adf474cc47bb7934497d336337447acbe3b4e2c1a2
 DIST github.com%2Fchromedp%2Fcdproto%2F@v%2Fv0.0.0-20210104223854-2cc87dae3ee3.mod 128 BLAKE2B 4d1baeb3d0a629cbb1fecf51e584ed575dcd8bd5244845f487b884304fb669a16f2b69f1d1e249665f4f493e57d6eb08d315ef1eea2d5180b94fd23b6fe5241a SHA512 2c35c1d5198cdae7437add88eaad34195f29bacc8a59c10ced04994fd15426374ea95a272e0f2988b360a5514d874971c211d8b1812facb4e84e82725077ff55
 DIST github.com%2Fchromedp%2Fcdproto%2F@v%2Fv0.0.0-20210104223854-2cc87dae3ee3.zip 478041 BLAKE2B 70c36b8f41f50cc3a22f82650edd42a97509f04cb3dc2b57efd5b7eb76a25300f2dabef41799512f144497a8fdf86a34b59141644f29094838c9b0d68d3f906b SHA512 a3e1b173c11397bbdd9f09fa0e58a876e71791811c52939f99efb91d86c5a5d9adbd5d9b7b02d673fbbf18d380a77db1de3e0e21aac32847905271ef7c7f1780
 DIST github.com%2Fchromedp%2Fchromedp%2F@v%2Fv0.6.0.mod 341 BLAKE2B 1d74ad6644ee8955e4895d837bf0edb326aa66463852c870ca136c72493fdae768f0026842bef993ef39c1dcf6ef242fa201324983892eed82f088a3dcabd7f5 SHA512 12935a598ddcee53eb6d0eae07fbed13f991ec81f2890f460fc33bbebfeee5d174ced3cc8882812e8231fad41dd545f0106cbbe6c80f5be11df4e579014d1a35
@@ -155,8 +153,6 @@ DIST github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.5.0.mod 254 BLAKE2B d34a
 DIST github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.5.0.zip 118409 BLAKE2B 47181974e809744cfcbe8b4a73d5bfe8d96c06cd273473a1b4e08a10f9cb670a2be052b3320be50883f11186308010c2da6e09611c16e834853e5bf820bb25e9 SHA512 3d4832b0f709d7059dc71bf6a63878eca72bc8aa3b6877825972fd75549598655af4484d956b342641938b692ecfb67c5d8be80d1a2207619cd34f5c2563e8cc
 DIST github.com%2Fmemcachier%2Fmc%2Fv3%2F@v%2Fv3.0.1.mod 44 BLAKE2B d8627452a1bff0b607125e33bee0ef71cec55b0bf0a220d755226bae8c7a910c799b6cfa85981ae7fbef04b8acf005dcda53e2f1c49a3f138f7516cca0cc4b68 SHA512 b7ad8b8fb9c091aae75beb141c55ee3edfca64e874e4d52fda76e8146c4b574d061f2ca4cd3b0b0f127f05279a3e75ac0657c45e185651835c91d8f48342bab2
 DIST github.com%2Fmemcachier%2Fmc%2Fv3%2F@v%2Fv3.0.1.zip 26613 BLAKE2B fb95e308f850b8ccf6bfc7809aed0eb34f9128b63398fe442f063c22af95668ea81157edfa32161f1a71c72f03dd3deb41020122760829437c13c6b48d556ed1 SHA512 e354a6dd3e46857c9a55aec0e7362ebc58e18c38e3d8b8cf7277cd75eaff556b897b71ee9c8ba3cf7570d0dfe2cef036e6535edb93a8a2a76aa409cee7d1b773
-DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.43.mod 210 BLAKE2B fed94d9122ba026bcaab9c4b54425ca6ab054452981cb2c1d007c069b46a6df74aaabf2e5711864d53455b259208181215a7a4ee47cd4f43b7781b7168150fcc SHA512 2b16b7814601de871aec90dfdd1a56d763cdb7132816ceef18ffe94e7862844353044430a49f20305278e6d5e3b42aef11428b88e4b4d17469a38946fa859ea6
-DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.43.zip 236767 BLAKE2B 8272123411e7df6fb2d55f4d81874148a671e6cb576f2c01e9b4635a748f954be524717e745ed397719ae5d5f486d9a2ee7bf5a0b274817202cccd907242c03a SHA512 d1b5da0e352db04818770174d784c4a6f52cdd6e4a3c360d32d8aafc51c0e004590e5e89d7f872f2708807a0fcad448546d1014ba1f2ac74540ab6d1bb389346
 DIST github.com%2Fnatefinch%2Fnpipe%2F@v%2Fv0.0.0-20160621034901-c1b8fa8bdcce.mod 34 BLAKE2B 3916e7eab36e455ef8f73b4eb026a0b4d5c04780a2f987530c3446233e627f00c87bad3db2d759c6427faccaea609be4b522553c338e0b9de58fce31293f2cd4 SHA512 c0fd9b298a72d846474932cdbabcf3133257b1f16120329efa2ab7ce2358a2c48604257f67ca7bee1d8b83e75a263330de796f5ba94a899f5260bd6af6385cce
 DIST github.com%2Fnatefinch%2Fnpipe%2F@v%2Fv0.0.0-20160621034901-c1b8fa8bdcce.zip 17199 BLAKE2B 38b247888ad647071971aa321b9ddb9e7bfd1129c03e3aac188a67e5b86442dbf1d969e1c07383f3570dfe54fc4b19bfda4689b2f371493c46e8d8b118533e56 SHA512 e16ffdc58a017d4c6f6fb7444b300cf6f20ebc6a1a81792a3fcad633d004b1183646cf86b74673f25c3bee5da72967fbe2adc161924be92d43ba18e3eda3a167
 DIST github.com%2Fomeid%2Fgo-yarn%2F@v%2Fv0.0.1.mod 41 BLAKE2B 30a6bf094208d9cb937a1cf1df4bc7229e2fafb2e5f6d0472d1e25c963f816ef98b5d248ed1dc9ccff89fa338f584bf7879b103f0c097ed688a6fd37a1106d5e SHA512 1dc4c57c45851a3a9a9018a0145c6a13689672ac2b1bf01527566df0e22ffed3a8caa9371a1195b8117e66cb1d4493b3ddac4643c9364ccaee0f906b22ec0338
@@ -208,13 +204,9 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.zip 1422376 BLAKE2B 5995b3bf9ad143a950acb3ea20e416518d8f90fa1486416b23895f7e8f8decda87cea64757616d8df1390c714ea5a50f4b2a1d1e4338157867da72f72b4c3f65 SHA512 fe2575eb7f3ca98d19db88886f0812f46e93151037b1286a89e9da22ea8adf1d27ad9243848885e3d309830a3fbbbd40f343a9333ef4cc57e66311d61d8ab638
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.zip 1587056 BLAKE2B b8b8cb2f12231f2e5129646f34a1138b138ea6b38af50ad8baafcaf155e9eb623e320823ec1b7502431df3f95dfa7ea1c8cc21abfee3c8831d913347aead0669 SHA512 0e635def6bc35ca664d28575366161fcce349c9f78386a9ffa3dc700da1e1badd6fbb8440113451ad7c1cb9a18b49f949632734946ec56ff56d894d8d74b56bb
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip 26635 BLAKE2B a464a4ad04b36e50cfe966e6e6dc299c0f8b45d0f4198ba64483bb70ab815d033cec5cde60753b76dd1fbb16fed087b41179100a2002b0a61cd4a08f9de779fc SHA512 ae6f29d5f7790b37d1722d65f31708670bf19f429c60b2f6633756ecd40e47c1fab40fc128e0d70b3b6ed0ba47ce5f970ce5f4e55b8f1fa407d2efee7444b646
-DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
-DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip 28693 BLAKE2B 3d6a34fa6da642f5ca71c930bd69a41439013f20ee60dde5d4dfab4bf688f1edb150a0477cb006670424c6c59e90d4bac9e5eb34f9fb4c518d903dfd26fb6cb7 SHA512 48b983589bd682ff9275c47733ec73637ebb5e58e1bca0c7744101229237d5cb34170efab63db0061aec857052cce9ef03c3497702b90a86287e6be88e1b33aa
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
@@ -228,12 +220,8 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200428200454-593003d681fa.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200428200454-593003d681fa.zip 1473712 BLAKE2B fe3a040968f3057669b04e538374c5b57a3394c7fc65ef9883fe298dfdb42329a56351afb887a7921a4612d4d58399c2fb7f5d68e43466f0f9cb4d876b9802c5 SHA512 61f2308d243b69ef923f66d1d7498d8774621dfb1ce02ad6bb4e2752eb11fff5ad4b67c56ed57167c88ad8408aa4ad34ee32751d84671c9ce1046b340aa04901
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.zip 1533790 BLAKE2B ade51a0080dbf82fcf320d06e65ed77ed824f22309892b55340bf6af20e88b704d34f253138ba91b87194fb7117f6145a7c2b76513f3c9a6d259e92e9e4ec6ce SHA512 b7a191ead0d85752296cb87f90664bfe552dc02d554c3aeedb28108d77e722fb44a3d8b305460c2f819e7cccdef9d94d270e629fed579ba6fc570c08d7c1f3ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210303074136-134d130e1a04.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210303074136-134d130e1a04.zip 1664835 BLAKE2B 5a05a5081c28ed36de591ed24ba08ab70df777f0b84fb84988941cb0c40d3d339f04cf356d29ec68c6b0f804d796ad19eb3fc692bf708c4a4a5e7498bb917c0c SHA512 350eec26a24a627c267c7603ec0b05667d2ce8be7a34e3a814c604ac238dd954542a16fe4c5f7bcaba6f301fc0087da812e14e00469484a7f02f46ead95526be
-DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
@@ -274,7 +262,6 @@ DIST zabbix-5.0.22.tar.gz 21245241 BLAKE2B d2343fc5dbc4112ef77c75bd00b8344a363a8
 DIST zabbix-5.4.10.tar.gz 24510838 BLAKE2B 37e8561e031b9267dbfeb786da7d88487142262c3f9063e83b2faafeabd88baa1a0f2e7ffa333d2e29c1b11e09ca995f42442aa60b0b994617b276152d46590c SHA512 452513c56db1778d49a32543814ed83836b480047ebc747e588b5cea8f9b199650824b9ea2042695c5551a81f1f3b2e8d98d0f658003f483bf8edf8ed5427c48
 DIST zabbix-5.4.12-go-deps.tar.xz 35810488 BLAKE2B 26a7995bbe6b40a1912f90e1ea572a0de96f9182928d2401054fc1935c9ecac25ee90cb44c7b1b0f71a8c56e4477752b2bffebca7a331fbdc341a7a9ca1eca6c SHA512 bd5882b1bfc4d75c2b42170bbab5cca5e8795f3ff001b62444faf5d1601c5ef54da0198c83253fefd5c2c465f78a9ddb2a4aa13699d198337af935a80756c991
 DIST zabbix-5.4.12.tar.gz 24513065 BLAKE2B fe289b58384c9b956fcbada940220c5288022457b7eb5b0a7ce2f86df777e2d84a45fc4d4f17f43aecac4466dc0e9d9941e0070cd00b3688b26821123d2301da SHA512 5f4862540e15f88efa52002b9ec6d7251a35e94f8e5f6f8b6090f5827a574411c813732a88a08fbcc3c24033011d678b953a7a78260aef702454269537232c7b
-DIST zabbix-6.0.2.tar.gz 33082787 BLAKE2B 53bd7574683e1166aa223ba5e992d951b5a1f1fc14e6555ebe402eb5e9f4845c3e9edc01c78e230d7120289b0e6c9a5ed87865c0541fa5095f23f6b6916defd5 SHA512 618b1705f4e1689af4d234e877ea4136d52de39bfedf6512f396b79278750bfaf994d132a7876420705690045bee78ebc2c7297ac31ac4ddd92f00d8f781267d
 DIST zabbix-6.0.3-go-deps.tar.xz 35806596 BLAKE2B bf86722b1ee26237e42b4b3b5558415e0eb29dbe675b70585c8bb06c0b1e469ed9887e425778503c1d42ee2bd938b085f544d0696d080e04957dcb5794b7afa4 SHA512 0a5a051561dee2f3e42f18fff9127e3c8a0b5a7cae3a828a880866feac81a21ef71ba83c53f9e5a37fb3eee78475974b2f30ba5398012aeca6adf8d3cea74399
 DIST zabbix-6.0.3.tar.gz 33135282 BLAKE2B d2cb50678710e96737e72ddb4b0b02d4695f872df6cab2edfd50d343ffc0103eec3191bfa02d8421e29c583f6d478598effc22a0f8d3f76b57a9ac3b4e4369fe SHA512 f93a7b4b19d2a1561e42ef67378bfb94a5edaae5b9bba8f2214de3bad1bf9d7efcb32da9f1b3ee820cc6bdc68308286606c4ceb7e1ba0ab42e24045c56f8ce47
 EBUILD zabbix-4.0.38-r2.ebuild 9387 BLAKE2B 2daf464895d6232c3cfa301b4fd55b895eed1e37cbfa9349398b430bedaab657413e2c12f04bcae4e23782cedef347560edecde1503531d18b4203040e7b07f0 SHA512 39e1563e5aec3c88c9cc3b23335b0db7c6201755a7ffa15eaee02b23838081d81c345e1bdfc608efcd2f6fb5d3306a863701f29c44ce0fcff8930579bc0345a5
@@ -282,6 +269,5 @@ EBUILD zabbix-5.0.20-r2.ebuild 31298 BLAKE2B aa61dc8c35d777638299a4247f45199deb3
 EBUILD zabbix-5.0.22.ebuild 9959 BLAKE2B f7cb1dd9d0637879bfd848c0a3342fa55da1e0ec85d786a08b0e7fccff425ff3248895270371251cfcdf4fc588987932c90f05f00f489914a27119c397e98c83 SHA512 a1bc2110b8e1bfcb9a4aca805df1f0e3d7e934613574991264bbb828a721c0a45484c1a15c0e278b7ab18707bec58b481c572a4967980841422288d5283fac52
 EBUILD zabbix-5.4.10-r2.ebuild 33688 BLAKE2B 38b38eb859df5b81ddeb4976d1571aafda2f23f7186c582e244b715f5e26508231042387130cb8bd4116edd3bf8b7d6ed58807fa03946b38cd7d707fa3fc10fc SHA512 1cce617a3162407a1add3b1f31ad184cfcbd4f15e05ff51fe9698cf1d0695775217385f0f6a7b7f8db6413159199d783e5c72c536c191b7a7cc4eb9cca62f395
 EBUILD zabbix-5.4.12.ebuild 9998 BLAKE2B c703656bb60f2bc6f7d5963e89d8b2ab836c1fb2ada1fb020ff5a60587954ed6a989d597cb8da8ec7787487a1aedf190d486856891eb63c8c22ff704b060897f SHA512 d2eadc0f2d0a5a3bfb46d6f275aaa56988845cbc54e01104f9aecc7cabe8b78b32ba62bf4738431108ea9bbc302b60789b72645dcd1c86858b46e74136f3b767
-EBUILD zabbix-6.0.2-r1.ebuild 35363 BLAKE2B 85f43352e26b63ad09363594930ab88fa74462a49eff7fd389fdeae8cfbba4fda6dfc816f72aa940a00fb93fbdcf182ea83b2d6c09781b52fe106aaecde652b7 SHA512 7ba4ee5500c56115ff8c26af2787c882573ae0ddc34526279d39ac7b971e417766b8a7a8772156c957a746b628f22a904bde47398f72c15485a61eabd70fdb50
 EBUILD zabbix-6.0.3.ebuild 10506 BLAKE2B 2b638e655cefc10aad589b4e629c3cab7e4b32ef7aeb0c702d454fcd3fe45bf3916b4218dee0cf433b5ea9ed657302ea6e64753bdd4121216af74423646f2b2c SHA512 da073199e15662e0a08118feedea310fdf7acaea0abb82c4a1ae4e965b606245636102776fe82a4a9f0816daa445244605c07d45f5768068cf9a1f93108adcf8
 MISC metadata.xml 1713 BLAKE2B d0c1fe7a3627dca5b11601ac5bc360f43476d4a14aefaa7eae021faa636cdd5b5054a4556c8c81933ad6d3638781942e51c01a550463e7b14946004fa8be3366 SHA512 8e5be31d41c1f749cda5b889ec7a1185428d88e21201c02d7066b4416ba3c6d4a9ddc23812e7caeb313dbc2b3ad7c9fd39eae141498ed137b8048fd41d6520d8
diff --git a/net-analyzer/zabbix/zabbix-6.0.2-r1.ebuild b/net-analyzer/zabbix/zabbix-6.0.2-r1.ebuild
deleted file mode 100644
index cbc8364059c0..000000000000
--- a/net-analyzer/zabbix/zabbix-6.0.2-r1.ebuild
+++ /dev/null
@@ -1,662 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-GO_OPTIONAL="yes"
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-# content of src/go/go.sum
-#   sed -E "s/^/\t\"/g" src/go/go.sum | sed -E "s/$/\"/g"
-EGO_SUM=(
-	"github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69 h1:+tu3HOoMXB7RXEINRVIpxJCT+KdYiI7LAEAUrOw3dIU="
-	"github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69/go.mod h1:L1AbZdiDllfyYH5l5OkAaZtk7VkWe89bPJFmnDBNHxg="
-	"github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU="
-	"github.com/cakturk/go-netstat v0.0.0-20200220111822-e5b49efee7a5 h1:BjkPE3785EwPhhyuFkbINB+2a1xATwk8SNDWnJiD41g="
-	"github.com/cakturk/go-netstat v0.0.0-20200220111822-e5b49efee7a5/go.mod h1:jtAfVaU/2cu1+wdSRPWE2c1N2qeAA3K4RH9pYgqwets="
-	"github.com/chromedp/cdproto v0.0.0-20210104223854-2cc87dae3ee3 h1:XeGYLuu3Yu3/2/FLDXyObe6lBYtUFDTJgjjNPcfcU40="
-	"github.com/chromedp/cdproto v0.0.0-20210104223854-2cc87dae3ee3/go.mod h1:55pim6Ht4LJKdVLlyFJV/g++HsEA1hQxPbB5JyNdZC0="
-	"github.com/chromedp/chromedp v0.6.0 h1:jjzHzXW5pNdKt1D9cEDAKZM/yZ2EwL/hLyGbCUFldBI="
-	"github.com/chromedp/chromedp v0.6.0/go.mod h1:Yay7TUDCNOQBK8EJDUon6AUaQI12VEBOuULcGtY4uDY="
-	"github.com/chromedp/sysutil v1.0.0 h1:+ZxhTpfpZlmchB58ih/LBHX52ky7w2VhQVKQMucy3Ic="
-	"github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww="
-	"github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I="
-	"github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ="
-	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4="
-	"github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4="
-	"github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY="
-	"github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38="
-	"github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c="
-	"github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38="
-	"github.com/dustin/gomemcached v0.0.0-20160817010731-a2284a01c143 h1:K9CFK8HRZWzmoIWbpA7u0XYLggCyfa/N77eVaq/nUiA="
-	"github.com/dustin/gomemcached v0.0.0-20160817010731-a2284a01c143/go.mod h1:BLhrehfVmtABJWBZTJV8HyPWCSZoiMzjjcZ3+vHHhPI="
-	"github.com/eclipse/paho.mqtt.golang v1.2.0 h1:1F8mhG9+aO5/xpdtFkW4SxOJB67ukuDC3t2y2qayIX0="
-	"github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts="
-	"github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4="
-	"github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ="
-	"github.com/go-ldap/ldap v3.0.3+incompatible h1:HTeSZO8hWMS1Rgb2Ziku6b8a7qRIZZMHjsvuZyatzwk="
-	"github.com/go-ldap/ldap v3.0.3+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc="
-	"github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4="
-	"github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A="
-	"github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI="
-	"github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM="
-	"github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs="
-	"github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg="
-	"github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY="
-	"github.com/goburrow/modbus v0.1.0 h1:DejRZY73nEM6+bt5JSP6IsFolJ9dVcqxsYbpLbeW/ro="
-	"github.com/goburrow/modbus v0.1.0/go.mod h1:Kx552D5rLIS8E7TyUwQ/UdHEqvX5T8tyiGBTlzMcZBg="
-	"github.com/goburrow/serial v0.1.0 h1:v2T1SQa/dlUqQiYIT8+Cu7YolfqAi3K96UmhwYyuSrA="
-	"github.com/goburrow/serial v0.1.0/go.mod h1:sAiqG0nRVswsm1C97xsttiYCzSLBmUZ/VSlVLZJ8haA="
-	"github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU="
-	"github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM="
-	"github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og="
-	"github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw="
-	"github.com/gobwas/ws v1.0.4 h1:5eXU1CZhpQdq5kXbKb+sECH5Ia5KiO6CYzIzdlVx6Bs="
-	"github.com/gobwas/ws v1.0.4/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM="
-	"github.com/godbus/dbus v4.1.0+incompatible h1:WqqLRTsQic3apZUK9qC5sGNfXthmPXzUZ7nQPrNITa4="
-	"github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw="
-	"github.com/godror/godror v0.20.1 h1:s/ehD65nfVzWR2MrZGChDkLvVPlIVxbt+Jpzfwkl1c8="
-	"github.com/godror/godror v0.20.1/go.mod h1:YlPoIf962ZZKPM5Xqa8NxmGgck39pi51tqAs+K3IaFM="
-	"github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE="
-	"github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM="
-	"github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4="
-	"github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE="
-	"github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI="
-	"github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0="
-	"github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo="
-	"github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk="
-	"github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8="
-	"github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk="
-	"github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA="
-	"github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE="
-	"github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s="
-	"github.com/jackc/pgconn v1.4.0/go.mod h1:Y2O3ZDF0q4mMacyWV3AstPJpeHXWGEetiFttmq5lahk="
-	"github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI="
-	"github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI="
-	"github.com/jackc/pgconn v1.6.5-0.20200905181414-0d4f029683fc h1:9ThyBXKdyBFN2Y1NSCPGCA0kdWCNpd9u4SKWwtr6GfU="
-	"github.com/jackc/pgconn v1.6.5-0.20200905181414-0d4f029683fc/go.mod h1:gm9GeeZiC+Ja7JV4fB/MNDeaOqsCrzFiZlLVhAompxk="
-	"github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE="
-	"github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8="
-	"github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2 h1:JVX6jT/XfzNqIjye4717ITLaNwV9mWbJx0dLCpcRzdA="
-	"github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE="
-	"github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM="
-	"github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg="
-	"github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A="
-	"github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78="
-	"github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA="
-	"github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg="
-	"github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM="
-	"github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM="
-	"github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA="
-	"github.com/jackc/pgproto3/v2 v2.0.4 h1:RHkX5ZUD9bl/kn0f9dYUWs1N7Nwvo1wwUYvKiR26Zco="
-	"github.com/jackc/pgproto3/v2 v2.0.4/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA="
-	"github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E="
-	"github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg="
-	"github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E="
-	"github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg="
-	"github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc="
-	"github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw="
-	"github.com/jackc/pgtype v1.2.0/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4WpC0="
-	"github.com/jackc/pgtype v1.3.1-0.20200510190516-8cd94a14c75a/go.mod h1:vaogEUkALtxZMCH411K+tKzNpwzCKU+AnPzBKZ+I+Po="
-	"github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ="
-	"github.com/jackc/pgtype v1.4.3-0.20200905161353-e7d2b057a716 h1:DrP52jA32liWkjCF/g3rYC1QjnRh6kvyXaZSevAtlqE="
-	"github.com/jackc/pgtype v1.4.3-0.20200905161353-e7d2b057a716/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig="
-	"github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y="
-	"github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM="
-	"github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc="
-	"github.com/jackc/pgx/v4 v4.5.0/go.mod h1:EpAKPLdnTorwmPUUsqrPxy5fphV18j9q3wrfRXgo+kA="
-	"github.com/jackc/pgx/v4 v4.6.1-0.20200510190926-94ba730bb1e9/go.mod h1:t3/cdRQl6fOLDxqtlyhe9UWgfIi9R8+8v8GKV5TRA/o="
-	"github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg="
-	"github.com/jackc/pgx/v4 v4.8.2-0.20200910143026-040df1ccef85 h1:G5gbS1Q6cq7/Q1Z1CUqU9IKWfar2R1P6CE0zkKClEG0="
-	"github.com/jackc/pgx/v4 v4.8.2-0.20200910143026-040df1ccef85/go.mod h1:OWJpVJk5U9XXEiYHeQ+5NtRt82Y5c8gvIZj96kl27Ow="
-	"github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
-	"github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
-	"github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
-	"github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
-	"github.com/jackc/puddle v1.1.2-0.20200821025810-91d0159cc97a h1:ec2LCBkfN1pOq0PhLRH/QitjSXr9s2dnh0gOFyohxHM="
-	"github.com/jackc/puddle v1.1.2-0.20200821025810-91d0159cc97a/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
-	"github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY="
-	"github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y="
-	"github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck="
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ="
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ="
-	"github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI="
-	"github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo="
-	"github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ="
-	"github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw="
-	"github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE="
-	"github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI="
-	"github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
-	"github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
-	"github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
-	"github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU="
-	"github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
-	"github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA="
-	"github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc="
-	"github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ="
-	"github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE="
-	"github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc="
-	"github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s="
-	"github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s="
-	"github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s="
-	"github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ="
-	"github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU="
-	"github.com/mattn/go-sqlite3 v1.14.8 h1:gDp86IdQsN/xWjIEmr9MF6o9mpksUgh0fu+9ByFxzIU="
-	"github.com/mattn/go-sqlite3 v1.14.8/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU="
-	"github.com/mediocregopher/radix/v3 v3.5.0 h1:8QHQmNh2ne9aFxTD3z63u/bkPPiOtknHoz80oP8EA/E="
-	"github.com/mediocregopher/radix/v3 v3.5.0/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8="
-	"github.com/memcachier/mc/v3 v3.0.1 h1:Os/fUl/8c+hc1qWgjv5hNK0JI6GxKUOuehzB/UmjLP0="
-	"github.com/memcachier/mc/v3 v3.0.1/go.mod h1:GzjocBahcXPxt2cmqzknrgqCOmMxiSzhVKPOe90Tpug="
-	"github.com/miekg/dns v1.1.43 h1:JKfpVSCB84vrAmHzyrsxB5NAr5kLoMXZArPSw7Qlgyg="
-	"github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4="
-	"github.com/natefinch/npipe v0.0.0-20160621034901-c1b8fa8bdcce h1:TqjP/BTDrwN7zP9xyXVuLsMBXYMt6LLYi55PlrIcq8U="
-	"github.com/natefinch/npipe v0.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:ifHPsLndGGzvgzcaXUvzmt6LxKT4pJ+uzEhtnMt+f7A="
-	"github.com/omeid/go-yarn v0.0.1 h1:mUQExNwUrYn7tZRwQdsUuoQWHIujtjjpjb/PAtUj9dk="
-	"github.com/omeid/go-yarn v0.0.1/go.mod h1:JYxmAvShSw7YmX/9vFsccpJE4o/KW111eUh3n/TQ5h8="
-	"github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0="
-	"github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4="
-	"github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0="
-	"github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM="
-	"github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4="
-	"github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4="
-	"github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ="
-	"github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU="
-	"github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc="
-	"github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0="
-	"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4="
-	"github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc h1:jUIKcSPO9MoMJBbEoyE/RJoE8vz7Mb8AjvifMMwSyvY="
-	"github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o="
-	"github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q="
-	"github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE="
-	"github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME="
-	"github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME="
-	"github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE="
-	"github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs="
-	"github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI="
-	"github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4="
-	"github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4="
-	"github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA="
-	"github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q="
-	"go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE="
-	"go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE="
-	"go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ="
-	"go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0="
-	"go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU="
-	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA="
-	"go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q="
-	"go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q="
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w="
-	"golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE="
-	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI="
-	"golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI="
-	"golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI="
-	"golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto="
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI="
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto="
-	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc="
-	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc="
-	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
-	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s="
-	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 h1:fHDIZ2oxGnUZRN6WgWFCbYBjH9uqVPRCUVUDhs0wnbA="
-	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s="
-	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw="
-	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg="
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
-	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
-	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ="
-	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
-	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
-	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
-	"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20210104204734-6f8348627aad h1:MCsdmFSdEd4UEa5TKS5JztCRHK/WtvNei1edOj5RSRo="
-	"golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/sys v0.0.0-20210303074136-134d130e1a04 h1:cEhElsAv9LUt9ZUUocxzWe05oFLVd+AA2nstydTeI8g="
-	"golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
-	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo="
-	"golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ="
-	"golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk="
-	"golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k="
-	"golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ="
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ="
-	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs="
-	"golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q="
-	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc="
-	"golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo="
-	"golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo="
-	"golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo="
-	"golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
-	"golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
-	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
-	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
-	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE="
-	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
-	"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM="
-	"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw="
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0="
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY="
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0="
-	"gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI="
-	"gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s="
-	"gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw="
-	"gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA="
-	"gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU="
-	"gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c="
-	"gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI="
-	"gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10="
-	"gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI="
-	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg="
-)
-go-module_set_globals
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
-	agent2? ( ${EGO_SUM_SRC_URI} )
-"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +pcre2 +postgres proxy server snmp sqlite ssh static"
-REQUIRED_USE="|| ( agent agent2 frontend proxy server )
-	?? ( gnutls openssl )
-	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
-	server? ( ^^ ( mysql oracle postgres ) !sqlite )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	gnutls? ( net-libs/gnutls:0= )
-	java? ( >=virtual/jdk-1.8:* )
-	ldap? (
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls:=
-		net-nds/openldap:=
-	)
-	libxml2? ( dev-libs/libxml2 )
-	mysql? ( dev-db/mysql-connector-c:= )
-	odbc? ( dev-db/unixODBC )
-	openipmi? ( sys-libs/openipmi )
-	openssl? ( dev-libs/openssl:=[-bindist(-)] )
-	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
-	postgres? ( dev-db/postgresql:* )
-	proxy?  ( sys-libs/zlib )
-	server? (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	snmp? ( net-analyzer/net-snmp:= )
-	sqlite? ( dev-db/sqlite )
-	ssh? ( net-libs/libssh2 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/zabbix
-	acct-user/zabbix
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? ( net-analyzer/fping[suid] )
-	server? (
-		app-admin/webapp-config
-		dev-libs/libevent
-		!pcre2? ( dev-libs/libpcre )
-		pcre2? ( dev-libs/libpcre2:= )
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	agent2? (
-		>=dev-lang/go-1.12
-		app-arch/unzip
-	)
-"
-
-# upstream tests fail for agent2
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	default
-	if use agent2; then
-		go-module_src_unpack
-	fi
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	local econf_args=(
-		"$(use_enable agent)"
-		"$(use_enable agent2)"
-		"$(use_enable ipv6)"
-		"$(use_enable java)"
-		"$(use_enable proxy)"
-		"$(use_enable server)"
-		"$(use_enable static)"
-		"$(use_with curl libcurl)"
-		"$(use_with gnutls)"
-		"$(use_with ldap)"
-		"$(use_with libxml2)"
-		"$(use_with mysql)"
-		"$(use_with odbc unixodbc)"
-		"$(use_with openipmi openipmi)"
-		"$(use_with openssl)"
-		"$(use_with oracle)"
-		"$(use_with postgres postgresql)"
-		"$(use_with snmp net-snmp)"
-		"$(use_with sqlite sqlite3)"
-		"$(use_with ssh ssh2)"
-	)
-
-	if use pcre2; then
-		econf_args+=( --with-libpcre2 )
-	else
-		# If pcre2 is not enabled, then use the old pcre library.
-		econf_args+=( --with-libpcre )
-	fi
-
-	econf ${econf_args[@]}
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		dodir "${dir}"
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-	if use agent2; then
-		insinto /etc/zabbix
-		doins "${S}"/src/go/conf/zabbix_agent2.conf
-		fperms 0640 /etc/zabbix/zabbix_agent2.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
-
-		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
-
-		dosbin src/go/bin/zabbix_agent2
-
-		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
-		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-1.2.9.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-1.2.9.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.7.32.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		tmpfiles_process zabbix-server.conf
-
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-
-		if ! use pcre2; then
-			ewarn "You are using zabbix with dev-libs/libpcre which is deprecated."
-			ewarn "Consider switching to dev-libs/libpcre2 (USE=pcre2) as soon as possible."
-			ewarn "See https://www.zabbix.com/documentation/6.0/en/manual/installation/upgrade_notes_600#pcre2-support"
-		fi
-	fi
-
-	if use proxy; then
-		tmpfiles_process zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		tmpfiles_process zabbix-agentd.conf
-	fi
-
-	if use agent2; then
-		tmpfiles_process zabbix-agent2.conf
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
-
-pkg_prerm() {
-	(use frontend || use server) && webapp_pkg_prerm
-}
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 7fe79f263bd2..8a1a0bee268d 100644
Binary files a/net-dialup/Manifest.gz and b/net-dialup/Manifest.gz differ
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index 6efc172ab941..1476b4d3081f 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -12,5 +12,5 @@ DIST freeradius-server-3.0.22.tar.gz 5248422 BLAKE2B b48170a02a354562dc2dd272304
 EBUILD freeradius-3.0.20-r5.ebuild 7548 BLAKE2B 820b94e6639b22478d3e603fd2f85c98cbf727c841811c57eaf26f22ae9fb536424aa6b63fa969b46491293aa592a46d56832bd41457fac41c84c8143bdc0b8a SHA512 8a7814fa663bc205f2cb26a5562d6d36df648ad4f2ce7ed2e975c4bfbac71d278a8cf754df1d152edafd00dd81684e207f06b1b69e4b11b80d32e082d21489c1
 EBUILD freeradius-3.0.21-r5.ebuild 7445 BLAKE2B 3a315a69bd5e4fcc7df715e7541c3937aac6a7a769f4b6b737b78062f74d1b5b92b31937f6e8c49aa6c05a74a02f4413af234fa3ee9c4e1aabfb1eb9281ed102 SHA512 1a3c9fc215553675e93c1018c4ca8916f8d463a37df435af705afccebfa52897bb540ce885b1852a17d0b81076869c0c24f9c9fe9eb6c9bacece2b024f693db4
 EBUILD freeradius-3.0.22-r4.ebuild 7448 BLAKE2B 6296c54de4f3a36e5ddab9c818ab37fea97f15ac2f8a28d6303c760864176a5811125d4901c666edf49837580740131d31dabdc67802cab1cdfd1f6935cc3537 SHA512 61cedbe4bfba93b823a2d2424a40b920cc334cc8cfce67c58988addcf6fd223375edef571de10f5acbd72efd15cfcf7e4311150d7f51fe9484d50ab05953a246
-EBUILD freeradius-3.0.25-r2.ebuild 7518 BLAKE2B d75e01897134bf13679d3d4e8f5dc17ad11584505bf46afe3c71537a620a2a2001ea4f87edccd97ba3d6753ef1cc2f4e0dbc234245dd104122267cfa49fb78a5 SHA512 75196ef597a6d73314b7d192487a3ed22f2e009d1971e3f77543d979b13f55450a41c6f1cc6c45ac7f73a72f1c79473eb72f82b3c36eb4e7793d5ade5fb37903
+EBUILD freeradius-3.0.25-r2.ebuild 7515 BLAKE2B 909f7f96fce8d9bb46a6003a6ee2714972d284332d12d071157ba05858325a1b42f244dc14d390aaa1ffb3e923eeb586a76b68258fee3d1feacbbc65e4b7fa0c SHA512 1dcb6401815df597de80b8fd4fec6fa78d66bdbe6ef03699df438c1656ea41d22c1f41927b6d6e6b2ca4ca5c419382fde39a80cb9d1ff6acc144375deaa829af
 MISC metadata.xml 657 BLAKE2B 4ae124b2f8a4e2230ff696f06056c4d9ca2a03b989362b6465ba42b9a1d730f1f35776b3de8a455f40956d7d2e0746ddfeb304d13fa44f69347f88e97443a72a SHA512 21137127c400a99a024012defe01c3546178492ef608428e673008ae3e7d677f97a2b33bd6efbd6737b60144e0697cacb583e7d9b477187a109b3e7482d899b1
diff --git a/net-dialup/freeradius/freeradius-3.0.25-r2.ebuild b/net-dialup/freeradius/freeradius-3.0.25-r2.ebuild
index 1577a0e55c8a..050f03a07fe2 100644
--- a/net-dialup/freeradius/freeradius-3.0.25-r2.ebuild
+++ b/net-dialup/freeradius/freeradius-3.0.25-r2.ebuild
@@ -129,15 +129,15 @@ src_prepare() {
 		raddb/radiusd.conf.in || die
 
 	# verbosity
-	# build shared libraries using jlibtool --shared
+	# build shared libraries using jlibtool -shared
 	sed -i \
 		-e '/$(LIBTOOL)/s|--quiet ||g' \
-		-e 's:--mode=\(compile\|link\):& --shared:g' \
+		-e 's:--mode=\(compile\|link\):& -shared:g' \
 		Make.inc.in || die
 
 	sed -i \
 		-e 's|--silent ||g' \
-		-e 's:--mode=\(compile\|link\):& --shared:g' \
+		-e 's:--mode=\(compile\|link\):& -shared:g' \
 		scripts/libtool.mk || die
 
 	# crude measure to stop jlibtool from running ranlib and ar
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 34670fbef9ea..86d7ff38a4aa 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 091c98cf8307..605c0c725357 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_5.41.0_amd64.deb 115950094 BLAKE2B f1ab73da6a07dc4e667cef2cc7bd80aa843cd11dee915d8128502ebeb18b606f67c88186c9fef367eab5f89be0cae02c7ff22dfbd8b2863212e3b1c04445b367 SHA512 3751d961d10d9613cbed76e1a5f217ec04e563c70c7a4601eb0178ee46778eb93a2257243bc7a19afaee049fe03319170092de065862720c06f84003e8c75862
-EBUILD signal-desktop-bin-5.41.0.ebuild 2427 BLAKE2B a95cd9809345ce6a1220720278dd2e876bee3804377628fcaa81c3e0e6a66c18f40ee0f45512cfe5dc3c0640a69690ce6cd7428b74b6f19dd13b15fdf7698a80 SHA512 ec1fd4c473d491a54a71e715dfa48df453871dc11659a56ab33295a629b21b8d70cebd88c2ce8898978e1de598e1f152eafe85a07bf01b27a4c013b81aee8cdb
+DIST signal-desktop_5.42.0_amd64.deb 116405706 BLAKE2B 68d1d92397d2afc04abdf33e66f0ee7ac762745dda30e76190a6f91686163494a23fc70001ffa7ccd007bd30bdb7f47276a725a823e77f575f4842067f3f98c2 SHA512 9b776642bfefba20deea238243463e48334c6007af10a542a4134d3334867d7cf5327907654bcb7bb1cd5fc331faff24cf71a0c51c35bcea0defade9e21ec548
+EBUILD signal-desktop-bin-5.42.0.ebuild 2427 BLAKE2B a95cd9809345ce6a1220720278dd2e876bee3804377628fcaa81c3e0e6a66c18f40ee0f45512cfe5dc3c0640a69690ce6cd7428b74b6f19dd13b15fdf7698a80 SHA512 ec1fd4c473d491a54a71e715dfa48df453871dc11659a56ab33295a629b21b8d70cebd88c2ce8898978e1de598e1f152eafe85a07bf01b27a4c013b81aee8cdb
 MISC metadata.xml 397 BLAKE2B 8b09559d9ab0428415fb6301596386acc0983bb312f099c6c5299492043f59d6b2e1145f29885e9fc429f4e0d28fccac19cdd7afb5c5ed5f70383a9075d0e466 SHA512 8fa1b372993842145229779dc730c574f688411efd3da415b00928d81947a91c1dabb7c53412aa3c413a5e1071d113b182c54b113a933c0d5ddf3de08869267b
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-5.41.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-5.42.0.ebuild
similarity index 100%
rename from net-im/signal-desktop-bin/signal-desktop-bin-5.41.0.ebuild
rename to net-im/signal-desktop-bin/signal-desktop-bin-5.42.0.ebuild
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 89d3ddafa6a3..ddb1407bd7cb 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index e7a3b6d5142c..38befd5d157b 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -1,7 +1,7 @@
 AUX gerbera-1.0.0.confd 531 BLAKE2B 712304e55ec4f2be59fdfb7a03f8a52e173f44e6903e91b9e542e3e9ac0bd51992c6c024ead3c9643e067430eefec9305ea3e8c9c4592a254da518baead245fe SHA512 7e02ce95ab75665c75463a07255a23832a6392a073c432304fc971eaf3a338c401e6f6d706798301b813c24bee2c4a5cbb0ab6cd13b73f6c7f60d0b2a99a0931
 AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f6fb6e5bf5511f3b727a9fe10792cb1e8660b92afe9047d0a845553bc922dcfda832b1f32e8a2ed8b183b SHA512 dfdb6c1b4c7ce252a18303507c9e0df38145865dbcacd1c27026d4bca5203beede99e6315e1abd57fd7713a89860b33aadd07df9448ed54a2ed64c872ee8926d
 AUX gerbera-1.3.0.config 6342 BLAKE2B 519b2b0f79803bb516b5bd43a692af38039a273318a3486b67c9f040ab9061fb9a2b2aef484fb9e22b584fa7f5d1e0a4f7e61f896f6f9b1ce4f657349506b873 SHA512 e551413ad62ca849561991880ba9049ebb6662ec06ff21d5483bbcc2499df04c72ac170fc4235ebd05c5d95926cdd7fc4db27083cb10fa4fe38f10a1141bf417
-DIST gerbera-1.10.0.tar.gz 3960516 BLAKE2B 9240ff4334f6f018ed27489f3984bd8439eb1ae9784712d23e778f9c3054c37241036a32167fc1c19303f4d68db3862ae09e35b7a3f4c15ee1e960a1aa78086c SHA512 9bb605b6475bddc5b683433bc9c50818e4986fc134bb0a6daaa444d1733624164c6ff7440789af95da2ec3c04b6c2f4fd46a29744b4ef793b10d9fab0c65a881
-EBUILD gerbera-1.10.0.ebuild 2243 BLAKE2B d01c18d7a95217703f4c3e4e5155716418c5d6fdb59cf4cf29f10695d5213bb881b949f7450c7636939339f833c094b192e906ef01b3ee4729d8137a867703d2 SHA512 fdeaf5d80a85f3d3b5a491e07c01dff949409ca494e18284312bb4587bab7c8db796b6f92f7c01016ce180686c1b168feaa36f8f3351446b41e4a6fb8526862c
+DIST gerbera-1.11.0.tar.gz 4115178 BLAKE2B 1b5f28c4602f949459816f57555bfebbedbabc9681b3d0d9eb3d7742a9b273644cf9c10b411baeb3b0c4b5ea3c340d1c0d8d6035cb0e7f38ba0c40fae1c5cd1b SHA512 ae2b3342b3b57ce6d656d0ebadfd73b5f2764f2164314f6b0deac170a82e6861349c37732e6914454918112124038b221dbd4882001b5de51a49326432ccd70f
+EBUILD gerbera-1.11.0.ebuild 2243 BLAKE2B d01c18d7a95217703f4c3e4e5155716418c5d6fdb59cf4cf29f10695d5213bb881b949f7450c7636939339f833c094b192e906ef01b3ee4729d8137a867703d2 SHA512 fdeaf5d80a85f3d3b5a491e07c01dff949409ca494e18284312bb4587bab7c8db796b6f92f7c01016ce180686c1b168feaa36f8f3351446b41e4a6fb8526862c
 EBUILD gerbera-9999.ebuild 2243 BLAKE2B d01c18d7a95217703f4c3e4e5155716418c5d6fdb59cf4cf29f10695d5213bb881b949f7450c7636939339f833c094b192e906ef01b3ee4729d8137a867703d2 SHA512 fdeaf5d80a85f3d3b5a491e07c01dff949409ca494e18284312bb4587bab7c8db796b6f92f7c01016ce180686c1b168feaa36f8f3351446b41e4a6fb8526862c
 MISC metadata.xml 1205 BLAKE2B f0fbdc991782018368d65f2d5475ede1a1a0cb2a8a16de4e7c4ed7586057cac18a2d6fe9bb405c8267337e453b26c69e69042dac3bfd5ef858f23fa7c468ef2c SHA512 a231be2b6829fb2f59fa3e66c830a16358782c915e806bfbee919a6f7ebdf9d33d53aa6860814ba5a5c7251ce2562f313af592ab5fcda701a7673b334627b1a0
diff --git a/net-misc/gerbera/gerbera-1.10.0.ebuild b/net-misc/gerbera/gerbera-1.11.0.ebuild
similarity index 100%
rename from net-misc/gerbera/gerbera-1.10.0.ebuild
rename to net-misc/gerbera/gerbera-1.11.0.ebuild
diff --git a/net-misc/sysrepo/Manifest b/net-misc/sysrepo/Manifest
index bb652f2cf36b..cdba1e0a37b7 100644
--- a/net-misc/sysrepo/Manifest
+++ b/net-misc/sysrepo/Manifest
@@ -1,4 +1,3 @@
-AUX sysrepo-2.0.53-musl.patch 208 BLAKE2B 9cc49eeef2bd950c25259fdfbc308a8788bf2e8d97777db7a67abdda9cc66fa9a32c4221eefe82cd8b8b829d9848df6164ceffd3e63b251ce845ed0adc453456 SHA512 34d058d0a5dff6ea959ab0ee0882b6fc4c6c0ea257f790568bbd5f8cc12abb5405dbf7bb850d81d5b1836a34c231041157a0aba55ca5f67d570e85b2dce19b7c
 DIST sysrepo-2.1.42.tar.gz 712516 BLAKE2B 6ae56ada0156f49483ca9c3b2494a4bc8093ffa910a2f043e12f4cc5af2285580dfd0f950d5fccb2c00b5a299c9345045194b480ef857448479de5e838b49bbc SHA512 186eee0f1ddef28a1aa2d9a9038e9fcbfc829579f1a47eeefb4f2aa31d18f97ec2723bd04fe0684f80dacfba3d1a8da8748b564e310ffbdde5f18251c81d7405
 EBUILD sysrepo-2.1.42.ebuild 776 BLAKE2B b471c3dbcb63922783798bb9e56ba8e23492cb8c4656adfebabf42cc4167389b96d681f0ddfd72a296e83d081c7e66448b1520c74970c5ffbbdd1219791733e3 SHA512 fa25527f2efff4a73bf2d71bc04d2c70bce3b94e87f84570b6f4cffd477b38f54e019c4dfcce92fe7b0f4589f74b3ebd599f5bd6b1bd70e068e48b1d7bd14cda
 MISC metadata.xml 328 BLAKE2B e91ac8ab81f342a9cdbf7b924f37c12f2adade3b0dee1972a3b2f2035997d6e8f5de414a052f2e154f6cecba1ab310103db2fd60e16d085875200bf08fcea522 SHA512 acdb3728e90337d98aea6f5174aba7a81d84259226ec6dda4607524184137b75431e621ebe29b99d371f6b3ff54aed15732a1d89229bf8cb100b52b4e0ae1a99
diff --git a/net-misc/sysrepo/files/sysrepo-2.0.53-musl.patch b/net-misc/sysrepo/files/sysrepo-2.0.53-musl.patch
deleted file mode 100644
index 24c5d86edc59..000000000000
--- a/net-misc/sysrepo/files/sysrepo-2.0.53-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://bugs.gentoo.org/828916
---- a/src/sysrepo_types.h
-+++ b/src/sysrepo_types.h
-@@ -19,6 +19,7 @@
- 
- #include <inttypes.h>
- #include <stddef.h>
-+#include <sys/stat.h>
- 
- struct lyd_node;
- struct timespec;
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 581483187978..65701372455a 100644
Binary files a/net-proxy/Manifest.gz and b/net-proxy/Manifest.gz differ
diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest
index 706b94060d8d..18cd1664ef5a 100644
--- a/net-proxy/dante/Manifest
+++ b/net-proxy/dante/Manifest
@@ -12,5 +12,5 @@ AUX sockd.conf-with-libwrap.patch 870 BLAKE2B 8c56ab479f99f6dff61882c01842ef0780
 AUX sockd.conf-with-pam.patch 295 BLAKE2B f41c2109e21878d2b473c6cffb4fe845d59ac0478f5196f7ccdc42baafd674e0960169e3a9dbc4fedb4a27cb7df8bd0dfc255595a72c39185c7ffb177fb53da8 SHA512 78728605362360650e6a20869744fc941782b75d149c0835542faaad931104cb32dda56de77a7b4f9a4fa683053139c551bcf77607a047fb1be68b6da9388630
 AUX socks.conf 4185 BLAKE2B cb41b40e858c83d06bd5e199c4fc991e8dda0ee64d48fd94e52d6ef836e79d6a6f5f50b6dd55074e92b6f96f20db65922f53869f08506100ae8b59b722643cdd SHA512 d15ea77e20ad750f10285a42c9c6305cbed48313dea205139d8cf59fda4a4640bdd5c5bd2c295b32e0015b774d463f9ad34fa5a22fb188ae921dba1a533553eb
 DIST dante-1.4.1.tar.gz 1284288 BLAKE2B 34c78007245339088d79e0b969b8f55d20b0ee59d89c1bf19510b563799ac3c54c6b8b5f37bfb64410d60e893beb0e2d1d79893c0264b7481aeb4cdab2037e90 SHA512 1c8e2966ba68c8584fb99ff76ae1d9c8dfe669c7e5e61c7e6e7f87295d1280c3e7849491a6369ce27795040f951dcc11f4f2b3d7e46c54219594c89315d0487e
-EBUILD dante-1.4.1-r6.ebuild 2683 BLAKE2B 74af8133cd8b65c234ec70797af9de43087ddc5d5a2801f11be35cb82ce5702d1944c70ef322870bba48f843a5783f652d2eca028fb7830412f6fa3a10521c2f SHA512 70a96b23e15651258d98d330439efca4cf259fff724f2880c1f64c7e747009831b8282e472674b8e3771835a50d5f6f1ba6e0fa411fbc1ea7b426b46b06a51b5
+EBUILD dante-1.4.1-r6.ebuild 2767 BLAKE2B 951097ac7799bacca3052713d0647f395119c5b65915357c42bf0f73818a852faf54c4e37afaadbe2062edda0a576ae1a2bb624bee5c56cf9f17ddb2a04c4b34 SHA512 04b6bde686387ccda5b63dcf75ef5b1b680083284be6948f026bf04a69418157501131594997b669b8060cb27b24b40c283c886e54baa44132b2057a7898e9ae
 MISC metadata.xml 213 BLAKE2B 8999188a1062bf7ec3ba841f532113bb39808fbdbfd3cba1107aec6c8796e897b1ade98d0ea8e92eb504f132a51aa46fb49b6ad1a04c5b389d333f054c2589b8 SHA512 7d3e51679dce13a213e18c54e9072c88a121abad190a83dd7d1ce224b075ac639e4a0d0d8a2b98ca8a59da3a1576629b021afb9fe48c180345e609605c6aef0e
diff --git a/net-proxy/dante/dante-1.4.1-r6.ebuild b/net-proxy/dante/dante-1.4.1-r6.ebuild
index 18dc73c8e8b4..85808412bb40 100644
--- a/net-proxy/dante/dante-1.4.1-r6.ebuild
+++ b/net-proxy/dante/dante-1.4.1-r6.ebuild
@@ -48,6 +48,9 @@ PATCHES=(
 src_prepare() {
 	default
 
+	# 780039
+	sed -e 's/-all-dynamic//' -i dlib/Makefile.am dlib64/Makefile.am || die
+
 	sed \
 		-e 's:/etc/socks\.conf:"${EPREFIX}"/etc/socks/socks.conf:' \
 		-e 's:/etc/sockd\.conf:"${EPREFIX}"/etc/socks/sockd.conf:' \
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 0895dfa6c1cc..5d0eb297a921 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 9a9fe77366ac..26703ac951b0 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -10,6 +10,6 @@ DIST tor-0.4.6.10.tar.gz.sha256sum.asc 488 BLAKE2B 4f17ba1b555eeaa0aadad93484209
 DIST tor-0.4.7.7.tar.gz 7895089 BLAKE2B 18acfbe017b2ad456184f6031881149717f6fecad0d3e6daf90241a5a8ef296c32a36ace266d38b703f34b66d71e282c803f03f2059502c6ff6f4fdfb6641a97 SHA512 896e12fea9342b669911d9cb115cb8cfa3841739d7a90e7457b24a72ff02821cd08be21bde961f18ca35c514a5105315dcb1e9519c52390fd8064c57d1e245bc
 DIST tor-0.4.7.7.tar.gz.sha256sum 85 BLAKE2B 09e715beaf05926c4cdc13a43c8cd31ec2f477876a8a13915416d7ac955622c10c77177a1a0d7a7c4eb5a6c1256170379692c42dd2161889c51018f43f4a3398 SHA512 aa7d84bb7bc50d73835b95e5c5c68cff3d4da31e0b5d01e5765cce92963a4a391ca449638338548813fd51031f3114f38c57d617142831f16a967b22284db3c2
 DIST tor-0.4.7.7.tar.gz.sha256sum.asc 716 BLAKE2B 30e2a5a0867d3474aaa935b1dcada9ff96799c48e3e621e7519462dd85386ec1e44592d3ee93372bf1f649213f87247f1f30c0bcceb0ca40de5faecd3b2b90f1 SHA512 2a40a3d61803016b65f4fbab7263679d987811ff829b637d73cb404a4c6ea179f4234f8696833fdddb5af449726dc70e3d74297c0ba62e3ff41e28e372a2c020
-EBUILD tor-0.4.6.10.ebuild 3083 BLAKE2B 3f9fb3e38f144839c34653bc9b89a4839f17ce9e76b0968290cb959078d9aedd528fa5a4b76d0574d0d27aed6beca799b2d6777fa8a507a2e5740affa43ea90c SHA512 91fe3808a0b7c5a6245b7f42d680ac415da7322235c80930c6ffc44c99d1af4b6c34af9bf2312826fdab1510a67036df1865d30b04095314fd46bbe252261d42
-EBUILD tor-0.4.7.7.ebuild 3073 BLAKE2B ece2f3ab06741c0101ba6a58eb5d1f8daad165a11637ca4841700f189e9564b966f7b66116f5f95a759fc72b234329a4e7decc8245f23f4f1e72e5aec5d6f8dd SHA512 85270a46d6c09a1a037b6f18c241b83d8cb762464079ab4d6e3e340ed05192118c1491901b5a7a7a8d3fa330a6118b9dffc72dc9109d34fed238c056b0d814ba
+EBUILD tor-0.4.6.10.ebuild 3085 BLAKE2B 1b09e39479439bbd276f0a3f810f2509a7cdec2f5e1b31176586e213d2cb7398c97452e12b4960c3c75e37c3eed64691824d08f9ac0a6d66a701b5d3f7e3cea8 SHA512 8dbd47200f35f15479cf611f2f68346c534f30403b3d56d289717672097b150b627cfd91e64ae46a881e94f5c39714f830cc788931a13ca485f0872cc870ebde
+EBUILD tor-0.4.7.7.ebuild 3075 BLAKE2B ffad3d7f1332cba0a6a59915aeea390fdf7fd1d7a81d568aed9689cdf18de3380e0e03acb731347fa82571112198e81fa6cfa48fbb26a8f5c743436287a79561 SHA512 56c5694bddcafdb4abaecc5d6be5afa196ea9e113391cd0685007e71fc001d5c395d3b3459ffd0fa551b9853ff4b3ca1630bee8b9f27c45c59966b5a354b0219
 MISC metadata.xml 550 BLAKE2B 483cfc846fb5d2996ca0b1b947df203a3470c8ea4a9ed655ce7c40b6ee3bde22d9fc41945c1fda79bfd2f5d91c6c7886e8b3fa1b6f385c802722ddba927980be SHA512 85ff349fc58d1e122c8ae0476a6143585190928c1abf0d4b228ad7f2e991e813d19a8b75a89421acfb96fc8c1d73e34be0c1a0ff70c9c68594518047a0de3df9
diff --git a/net-vpn/tor/tor-0.4.6.10.ebuild b/net-vpn/tor/tor-0.4.6.10.ebuild
index 0e0a28e5d34e..e5d94f3b2d67 100644
--- a/net-vpn/tor/tor-0.4.6.10.ebuild
+++ b/net-vpn/tor/tor-0.4.6.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="8"
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit python-any-r1 readme.gentoo-r1 systemd verify-sig
 
 MY_PV="$(ver_rs 4 -)"
diff --git a/net-vpn/tor/tor-0.4.7.7.ebuild b/net-vpn/tor/tor-0.4.7.7.ebuild
index 3be286d5dfb2..ff633774bff4 100644
--- a/net-vpn/tor/tor-0.4.7.7.ebuild
+++ b/net-vpn/tor/tor-0.4.7.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="8"
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit python-any-r1 readme.gentoo-r1 systemd verify-sig
 
 MY_PV="$(ver_rs 4 -)"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index f5adb08bcd59..55df6af14e1e 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 7a5f697a14aa..92d8a2b3e992 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -18,11 +18,6 @@
 # https://github.com/aria2/aria2/issues/1636
 net-misc/aria2 gnutls
 
-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2022-04-22)
-# java conditional dependencies are getting last-rited as they are
-# blocking removal of vulnerable slot dev-java/guava:20 (bug #760111).
-app-emacs/ecb java
-
 # Matt Turner <mattst88@gentoo.org> (2022-03-25)
 # Depends on libsoup:3.0
 >=gnome-base/gvfs-1.50 http
diff --git a/profiles/package.mask b/profiles/package.mask
index bb14df058449..d49f9c570837 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,12 @@
 
 #--- END OF EXAMPLES ---
 
+# Hans de Graaff <graaff@gentoo.org> (2022-05-07)
+# Old slot without reverse dependencies. Originally introduced for
+# dev-ruby/gherkin but no longer used there. Upgrade to the new slotted
+# version. Masked for removal in 30 days.
+dev-ruby/c21e:1
+
 # Michał Górny <mgorny@gentoo.org> (2022-05-06)
 # The "better quality" dependencies of Mailman.  These packages were
 # generally fixed by the Python team but they have no reverse
@@ -387,11 +393,6 @@ dev-python/repoze-sphinx-autointerface
 # Removal on 2022-05-09.  Bug #837530.
 dev-python/zope-testrunner
 
-# Matt Turner <mattst88@gentoo.org> (2022-04-06)
-# Dead package upstream. No reverse dependencies.
-# Removal on 2022-05-06
-dev-util/nemiver
-
 # David Seifert <soap@gentoo.org> (2022-04-06)
 # Unsupported branches, no consumers left, removal on 2023-01-01.
 sys-devel/automake:1.13
@@ -414,11 +415,11 @@ sys-devel/automake:1.15
 # necessity.
 net-p2p/arti
 
-# Stephan Hartmann <sultan@gentoo.org> (2022-04-01)
+# Stephan Hartmann <sultan@gentoo.org> (2022-05-06)
 # Dev channel releases are only for people who
 # are developers or want more experimental features
 # and accept a more unstable release.
->=www-client/chromium-102
+>=www-client/chromium-103
 
 # Anton Fischl <github@fischl-online.de> (2022-02-23)
 # Version 2.5.* is not meant for production according to upstream
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 7cde01b61af9..e6675fca6d11 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2838,7 +2838,6 @@ dev-util/mdds:valgrind - Add support for memory debugging using dev-util/valgrin
 dev-util/mingw64-runtime:idl - Install idl files.
 dev-util/mingw64-runtime:libraries - Build extra libraries: mangle, pseh, winpthreads.
 dev-util/mingw64-runtime:tools - Build extra tools: gendef, genidl.
-dev-util/nemiver:memoryview - Enable the optional hexadecimal memory inspection with app-editors/ghex
 dev-util/nvidia-cuda-sdk:cuda - Build CUDA binaries
 dev-util/nvidia-cuda-sdk:opencl - Build OpenCL binaries
 dev-util/nvidia-cuda-toolkit:debugger - Install the CUDA debugger
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 57abd11ae7b3..837bb8a51cd6 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/i2c-tools/Manifest b/sys-apps/i2c-tools/Manifest
index cab41ffbb4cf..918a98b9da6c 100644
--- a/sys-apps/i2c-tools/Manifest
+++ b/sys-apps/i2c-tools/Manifest
@@ -2,6 +2,6 @@ DIST i2c-tools-4.1.tar.xz 83576 BLAKE2B 0a9ed3bb335b61f6c17a6b6c705502ff008b4fb8
 DIST i2c-tools-4.2.tar.xz 87600 BLAKE2B 89f84ad07f4c042f67c308d48a402aa9ed46352062ddad3456d048730019e099e6eef626d487d802e07b100ae2c836e9aa6b2345950ff8744cbc0fe1a22616fb SHA512 5e230be4983c5c9c5718491d3ce9ee2e6205edea75c4097735eb32a25e522e37a074ef4cb61d2492707efebf0cb1b75ff65f1b2ae8c0bc1684a169526809a096
 DIST i2c-tools-4.3.tar.xz 81276 BLAKE2B c7300224c8d32785cd067b632bf0e9591f05264b1572f44aebda5f30a95164732d606710c13739ccb7899476219ceb3033beaf95b718ed7e18122f9181dc13fc SHA512 8a6cc12d927d6291b9baf407bc15807280539a7048ec5c2edf77414432eab43b28353c42bc0e45b7b481502aa4c5588def08f130d97fc275f635d1f77488f501
 EBUILD i2c-tools-4.1-r1.ebuild 1950 BLAKE2B 5c926d1ab2f68669edb32c18afa7f850019fcfd442831b2bfb59c09119a81c6c03102a76eabd5f4a80c6f0998c861960a2a042c4a43d736051d6d8af1963154c SHA512 7dfef8c4f41023505161146cb6a9ec7dfc945d75a76615aab35d4de2f371240be173276d15b4c18f3819e2e0f5998712bb0df2586d819e22baa9852149978f0d
-EBUILD i2c-tools-4.2.ebuild 1690 BLAKE2B 5c3e6ef0896d8da417846c44519b50aa430589beabf0585793a0843818d1c05745dd632e5527fa898f89140fa100998d063ac2159b4c3dd6269fb13a0e9f1a78 SHA512 95fc4969e81bf6ab1c686f24ecccef2ee1316d067a7cea32dfaf5a661bfa4c30a8ea41cad576694d1d6d5208833214c1dddca12a71f216b38dae0d9784ce4d92
-EBUILD i2c-tools-4.3.ebuild 1348 BLAKE2B ca765bb7687dfe7f5f7c6544ad964fe442e32ab4790902eca511875774069f66e77f1bbde15195194580b8472bca9daca1743ee5003e42e802a99694f462dfaf SHA512 a8fed2339f6da3e08f3bebf247a544933437d0539bf29d154b71fc5e906991e75503ce7a5e39a983d38927d576b88395cdcaa0652155a6f5db643ed9c26d6042
+EBUILD i2c-tools-4.2.ebuild 1689 BLAKE2B ed6c1a0f4386a42c760420abc4f565b55b4f5e905f47eb528587cafb5b5aa865bbaadb5d2abc79137842f48ce798f2260baf3c889f7ebf2ec4a0caf08ac1b6ac SHA512 75d51125f60ee980017c7e13c2789485f019b760ffbddbffb4413c588fd60ac4629e335ffee2543c54d1850f91f22a7985d93c3d4fbe31fdfc7a4c6c62881adf
+EBUILD i2c-tools-4.3.ebuild 1348 BLAKE2B ad1df184b98d8483ba51cebe3c3706f2b0a6675cde10cb9f76a4583da59c16b43a6ef358fcb28eaf8fee2e04e5df7ee1d8664e6e5afc1d2c9f5d1940a375bc9e SHA512 38a08107d8610f9dff265b4763d800b752bd37c6bf8ffce7b81f90fb3c179093a8c03e5ee00b94bdc4810b633a21acbd63b9c4b4862923c79002bd9e8ff4f88b
 MISC metadata.xml 244 BLAKE2B 94b04f9b5ade506f66b25651b1fdabfaf11febaff3175956406893e90548e87145186ef43a617e24803bd22d9da3f90ea8d72cfea7847aea521974b3138e92ad SHA512 20225e64357a690e86df86aa4d784300459d28b775e3989f77fd31e752ef968de63e41b59bb3c78b331e817f9eceab6dd6ef01131451753a1b5d3a309770611a
diff --git a/sys-apps/i2c-tools/i2c-tools-4.2.ebuild b/sys-apps/i2c-tools/i2c-tools-4.2.ebuild
index 246cc0d212b5..c40274690e01 100644
--- a/sys-apps/i2c-tools/i2c-tools-4.2.ebuild
+++ b/sys-apps/i2c-tools/i2c-tools-4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="perl python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/i2c-tools/i2c-tools-4.3.ebuild b/sys-apps/i2c-tools/i2c-tools-4.3.ebuild
index 1b4f3d12d061..585e25ebd95d 100644
--- a/sys-apps/i2c-tools/i2c-tools-4.3.ebuild
+++ b/sys-apps/i2c-tools/i2c-tools-4.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python{3_8,3_9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_OPTIONAL="1"
 
 inherit distutils-r1 flag-o-matic toolchain-funcs
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 35f4e6d6b1d7..477065def3a8 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -15,5 +15,5 @@ EBUILD systemd-249.11.ebuild 14749 BLAKE2B 3b6ccb1617acceb9ebd90805aa7e2124be674
 EBUILD systemd-249.9.ebuild 14784 BLAKE2B ca86d60cc9890d368c269baa814c55345c05da6781dab850dc11d1ea81304e1d25319af0e3a81690df4fa178a796a54af5789dff4756c65b2bcb326f5f4bd511 SHA512 2c3166d0e8ce969b0117cd4454f7d8f71dcf6f079e7a8890cbe77c56e92e3d28d54e98ca07ed5dc0a391cd9acb0b58ce4869ee98b7d91f36fbdbfac54d01ee7f
 EBUILD systemd-250.4-r2.ebuild 15727 BLAKE2B 693d157b9b961f5a241bcd541a43b5a89adcba3e4a747cbb6675fc6ec2c3d34fc6601f8c090b6600ce3c898996db3cc151d68dfa0ce1750df4000fb46104ae06 SHA512 e25b31b1b39ddf5e7b0090e4d06742b4b2302efeb6ff66b4842e910000a239de9ac264a5872eea850f8e94024062d3d52074df756d232c9979359fddc9e097b4
 EBUILD systemd-250.5-r1.ebuild 15690 BLAKE2B 95db48fc59472e29d3e72fd105af3a1bf1915b21baf67f812bbe32748b625e3805754794657eec8bb719180df7c2a5e25e8f0ebb304383fa5ab09b516f6f5725 SHA512 bbc8cc748f8f76d47e090e8220c4eb2f669dad72f3d883903e5c87b3d9d2c9d71f8db4b51bc39fd3ad760955df2c3371c8dbf079f76c529d2e2d38b9274e8449
-EBUILD systemd-9999.ebuild 15533 BLAKE2B 4838d908ee83e955cccd4e34c802dc43bf2822551b139d7297fb88728862f1ba15b6f85893ecf74f994a15a5a1795addcd50405defa5cd50a50fff9fa8f1eafd SHA512 3f89e69753f92d40a6027f1d2f53110f7f078154a3c6f0036dee1750005afd4cfa08fe21056416cff80f4be7bf381737703ea5c4bc615d58a1c1ba8ff565ec2c
+EBUILD systemd-9999.ebuild 14692 BLAKE2B 58f6cdd2911d219c718c17fc5970867ecdc87062e01eff317935c90cc7416475b1241cc93485dc41ba2bf1713e5e6d392be6faed32a503c2803ac9f2d5f2e363 SHA512 d64f47aafe311650a6d186064c37a5a4dfe4ea29394770db48696d1ea04f74b9995eee4f2c5f340d51a125a0f567a4ebcc830cad142593b225f0f2eec6cb35ce
 MISC metadata.xml 2627 BLAKE2B b785769f4d2d029a935d8aa4da18d2366d283565a70db63b36eccbab4213edd3c0063a61fe58b313a37cd72fa4a848f4ba12dd3761f82b862a84a3b09ce06258 SHA512 ecbc947ffc3ad23afb6c07c60907d5cbb91053c4153c6661fa26f358710e3d7ca44ae4c3b0d229b428fbe5abb63f83175448e6fae8ec11c1cbe01c1a692c873b
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 3069cafa856d..044df638afe4 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -32,7 +32,7 @@ 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
+	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
 "
@@ -40,7 +40,6 @@ REQUIRED_USE="
 	dns-over-tls? ( || ( gnutls openssl ) )
 	homed? ( cryptsetup pam openssl )
 	importd? ( curl lzma || ( gcrypt openssl ) )
-	policykit? ( !hostnamed-fallback )
 	pwquality? ( homed )
 "
 RESTRICT="!test? ( test )"
@@ -118,10 +117,6 @@ RDEPEND="${COMMON_DEPEND}
 	>=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(-)]
@@ -407,16 +402,6 @@ multilib_src_install_all() {
 		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
 }
 
@@ -513,14 +498,6 @@ pkg_postinst() {
 		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() {
diff --git a/sys-apps/xdg-desktop-portal/Manifest b/sys-apps/xdg-desktop-portal/Manifest
index 3fd5494f4c59..73106df94fff 100644
--- a/sys-apps/xdg-desktop-portal/Manifest
+++ b/sys-apps/xdg-desktop-portal/Manifest
@@ -1,7 +1,9 @@
 DIST xdg-desktop-portal-1.12.1.tar.xz 484352 BLAKE2B afa14ab78f35cb1c0e66514f313f5dc297ceef88af1ca7b3028305faa8398bdae1b9e897289b18a93b1cda1a8290c0e51bf73e66c9dce231f57a58652fb9e120 SHA512 62df427e2d8d54acd9a34a02a77c26ae3911fbb4c5844eff4a253dc839775c929c6945401b93549ba200ba637d315146767e41f18a831d7627b35de880de0da1
 DIST xdg-desktop-portal-1.14.2.tar.xz 504088 BLAKE2B e0a378c1f1d80afda7d73fd8e545f7304eeab349cf3298ebb616021c7e16e8a088360681e31eedca9ac90978eb04167a7e857ddaa5e023a2a8c24c9f959f9b2c SHA512 7164d6c0d89843d117e03bc46963d72f24dae2b9fc8e173f06a78bbc80655ccf192d86f951d3c404c88bf5da88d9d2053ea52cf3e541b833ee937b6931d803d7
 DIST xdg-desktop-portal-1.14.3.tar.xz 504296 BLAKE2B 9416e6843ed4cb8a3b33f3665ce2cca7b1bf4fc4dfb9ac11bf8b6c0906829df25bcd6a32c68231d36e16f1cbd0181a2d938a06098f00dec34c3981bca943e632 SHA512 ced23bf0973227b5d89ea976aa0978fa16cfa2983dd6b64802714a852dab215584198c04482edaa5a145e292bf7f5b9c5c98ee864fb24abb5bdc48cd1c839a9e
+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.2.ebuild 1057 BLAKE2B 96717ed1de8af640d5a2e9ba776e04b9901c2980654d4bac60146201abe0ba5a9e13251ad49d25d89bd027fb3dd7619b5551d33075443babeb0c0c0a5ad5816f SHA512 e9e4de40e97bd48e80a88246c307a470c14a62cd76c1e1a0292958569a6f42e9ae0ac1f42b8ad0f23f3ca041339ee6fccde010b46cb032114cdea1622c26725e
 EBUILD xdg-desktop-portal-1.14.3.ebuild 1088 BLAKE2B cafd8ca7c6cb352dbb59b3c263b147f1d2cc15a669b5fb509740d08ea90a2f2b879122cfb6b126752862c8b1e7f49da6168cd3d318d2884143c69985a4f306b6 SHA512 2555737a1f5b4eefa8c59bdfa7ba8cfe4dcd32da8ce418a9171b4b722c5d45964d79a168581cf47af28e867716de9506c3a4b0ff4d803cff7b5968653c497cd8
+EBUILD xdg-desktop-portal-1.14.4.ebuild 1088 BLAKE2B cafd8ca7c6cb352dbb59b3c263b147f1d2cc15a669b5fb509740d08ea90a2f2b879122cfb6b126752862c8b1e7f49da6168cd3d318d2884143c69985a4f306b6 SHA512 2555737a1f5b4eefa8c59bdfa7ba8cfe4dcd32da8ce418a9171b4b722c5d45964d79a168581cf47af28e867716de9506c3a4b0ff4d803cff7b5968653c497cd8
 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
new file mode 100644
index 000000000000..03615c15f70a
--- /dev/null
+++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.14.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="Desktop integration portal"
+HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal"
+SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="geolocation screencast systemd"
+
+DEPEND="
+	>=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 )
+"
+RDEPEND="${DEPEND}
+	sys-apps/dbus
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myeconfargs=(
+		--disable-docbook-docs # requires flatpak
+		--disable-libportal # not packaged
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+		$(use_enable geolocation geoclue)
+		$(use_enable screencast pipewire)
+		$(use_with systemd)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index c23d2a491259..38e07305b221 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index eec63e6c01d2..96af9c24156b 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -16,10 +16,9 @@ DIST gcc-11.3.0-musl-patches-1.tar.bz2 3997 BLAKE2B 5ca064cc78b067f4a7822fa0341c
 DIST gcc-11.3.0-patches-3.tar.bz2 13567 BLAKE2B dba270d74b7a598e0108be0be7ff8cf01899d044ca4be9938cd5324465dc00c9e5cac4ffb4b6c1bdcdb824d75a7577eed63ae724c7e2887a19708992aca10f26 SHA512 7919b37900bbc2493564bc70f7911cf03efb857ff09c2b13280018fb54c48d8be42e35b649e69594a3ce61d51de847a8d4f75f794ce1dc50db3a700831b6a1e7
 DIST gcc-11.3.0-patches-4.tar.bz2 14030 BLAKE2B cdd555f329c7c0b993cd3527489681bfcc2162db0997611b66337e6b287356761c7deccd3b9f9bb8980a32df0574017a52c5e445e24db746757d87ffccb1ea89 SHA512 cb227599d01734ae9f9fc7ae2c8dd4cae1da80d6ab398ec6f112535239ac76ce8e91fbac88e19c2f75cb08ab75f966c1d1ad4af80ede67e953fbbafc7baefa58
 DIST gcc-11.3.0.tar.xz 81141364 BLAKE2B 7e562d25446ca4ab9fe8cdb714866f66aba3744d78bf84f31bfb097c1a981e4c7f990cb1e6bcfec5ae6671836a4984e2b70eb8fed81dcef5e244f88da8623469 SHA512 f0be5ad705c73b84477128a69c047f57dd47002f375eb60e1e842e08cf2009a509e92152bca345823926d550b7395ae6d4de7db51d1ee371c2dc37313881fca7
-DIST gcc-12-20220430.tar.xz 79067316 BLAKE2B f625c4c91d9e1bd234b36115f30adc54f759c6610eb9c85892366a5b4979f4d4adcf90f9de6611638aafc654e5651f89a04f4e28f860bcc37af51cedeecc05e4 SHA512 e342f73ae8b7af12153b694ff93c5b76fcbf9955c69e247f4f6fe15e8a748d320e718a807984c4f63d31f2a2336ef3f170327be9033a0536020bfad8b7447a3c
 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-RC-20220429.tar.xz 82681644 BLAKE2B b65544298f036b3266b5ff6e0cefa369dbfbc80174e8f633cfe274727fded9cfb1bbb396ed616db28cf8d61f4a33bfa8c6d4287739f6ed518f8afe570b1653fb SHA512 0cc17ff5402bac26625f3a353e06d0f8a780355cdef1af20466b35427ab40910705798a3104b88ada1cbb225a833b6cc043ead60609785c19c46fdfa0942edb5
+DIST gcc-12.1.0.tar.xz 82701928 BLAKE2B dca5df8fea680dbeda721742cce5c97de7eb4be490a32a158e06b88e2b9dd092150b7cfe490bb69e48e2f75d8bba231c8a54cd46b48ddcdc01bf9553ab57019d SHA512 2121d295292814a6761edf1fba08c5f633ebe16f52b80e7b73a91050e71e1d2ed98bf17eebad263e191879561c02b48906c53faa4c4670c486a26fc75df23900
 DIST gcc-6.5.0-patches-6.tar.bz2 15320 BLAKE2B fe6b60cd45d00187e4e41e607af6a1137481a6d8f4421a0ead7da9fd86d0cd19bf428e5d150e1de4e0616606f8d6c31738da24be8151c58f7760aa92432ea3d0 SHA512 87c2a6726373999472cbd6211e486864266c833d5a07f8fb02dd3054b7dd3f86aa86ea47b17928045ef6e46d82f429f879d6f69d8adf3b6f2956f4ac6b3f80f1
 DIST gcc-6.5.0.tar.xz 74355588 BLAKE2B 538595d32000b15a53577f0dc6b164d75791a8ccdf90500d5f667ff78378ef4ab9bedb8a590848907caf863bf1165ebe108b5e81eb4b54e85ced4002affde693 SHA512 ce046f9a50050fd54b870aab764f7db187fe7ea92eb4aaffb7c3689ca623755604e231f2af97ef795f41c406bb80c797dd69957cfdd51dfa2ba60813f72b7eac
 DIST gcc-7.5.0-patches-4.tar.bz2 13183 BLAKE2B 38a56910f01ef4172182d2145cef1df53b57eaa8f0655223cf54689e7ce12a264bfbb3735bde42b8a8594ab44031d9c48dc0d5303fab6537746f05e4d46b427a SHA512 28d3732d5351dabd1452ee0462865a0de00103d9ea66941e38499c532b34ee8beb150b0b32af58cde901e437b4c256593c29736a5e7df2575aa0d0c43b6cf6eb
@@ -36,10 +35,9 @@ EBUILD gcc-10.3.1_pre9999.ebuild 649 BLAKE2B 7c2d1e2d939433104d3fb01de2dbdb12b60
 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_pre9999.ebuild 916 BLAKE2B 7d4536513bc200681534568a22efc5a06cb8b246f775b7465034c47f43a0dcd0f25a4ebff9ca67c47425fe6d1528918afc00e36b2b60ce87c0163fc8b552c9db SHA512 d2c88b671880e600b867f25eb9b7ae0e5c0df748d1171ec8f28a3a661974a8b4145ffd2ad004480fbfa6217ceeb3933ca4af9d9da91eb24c7fcab822466e22c6
-EBUILD gcc-12.0.0_pre9999.ebuild 939 BLAKE2B 6759fc9157b2edac1814583f86486629cd9edcb49510e7963e370793361b47b6e9154b4a24bd784386726f91bdbc99714e1e3a09827ad392a1f1c53e6ffe3bd5 SHA512 65d13ad151c62c4b5fce8060859dfb884e2708d6c73359f8e3125ee21d057559a7e303e67a66bce80eafcb0e18af11f968d2d8ffce9b4b7b0da41a0ef094cfa8
-EBUILD gcc-12.0.1_pre20220429.ebuild 1048 BLAKE2B 18abe7bcb228e92767b5c7daefa0d7b086fa4aaa5f940e5cadf33a86c76ca67535eda05d6161d9eda1c00f30b31507db3b107517dccbd003d968aae03c13f40a SHA512 b8b05ee91e576dcf9328c3dda6ffbaa94adc3a18afc51b1ef3ba69cfa62b126b60f263c97c67554b565b2d665802d444bbeeed16a79288aa0597a70ebe1b129c
-EBUILD gcc-12.0.1_pre20220430.ebuild 796 BLAKE2B b9b82b632001ac8ce9c9c58d623efd19da1d0c4301fea3fb6a17c0554bb0ad1d7285a46c510490df0274aaa6cba303ebc7ffa9255a72edf489fbc8212613a471 SHA512 1d3ade10f59e083bd97146e71a89cee17ccdc803adf6bb4d958905b7db09d9acd701677ba2e8b5f50d0ad56d631d0d6ff21a36355501ae74bcb72ad77d897272
+EBUILD gcc-11.3.1_pre9999.ebuild 801 BLAKE2B 17943ee08729ea013143bfd3ccea15f2f5475d71b94176f3e6f15b572829b8d11ec4555eae61748c340c499f31dee5f38f9fac889548d67d7a903634ae46c0b7 SHA512 dfa731d12570f7c934be82cb2a58516141cad47bcc021f8bad15ad488f802d1e241a1afc013f12f734f44b37b95d84c2e7f8809a1d0564876625c4d5f74120d4
+EBUILD gcc-12.1.0.ebuild 681 BLAKE2B 6d02984ab21117e66f97d977692f13f9839c8f84c1790495fbc582fa7ba06ab9231f0150c0dfed9d15006b6832efe858c2743089fdeb7e8d1f16ed40b509709a SHA512 be61020d8b08d4ee94a1bdd49bacd2f2e15b96b8549fc8e60ee7332b925c788af85f8455808965c1eb1d537528079104516624dd4bc331c5bb1cdbd71163d206
+EBUILD gcc-12.1.1_pre9999.ebuild 914 BLAKE2B f71e9864df8ae780be689c7d0e5ad7d6ccbd710507f24bbd3ff158970459d22b542dbdba077e808426ec690b19e788403b957605d9c14c9b1ff78243e4ae7a17 SHA512 f35478b03ae47ad881cdf94a6bae2c1e7e21f02cf2381d07d573e2f426bc9eba11e86d6749d91d2be6527122207f5944bbe136d379cf196950e5cdf8a899ae7b
 EBUILD gcc-13.0.0_pre9999.ebuild 930 BLAKE2B 89f534172872b5864e123635fe3e3f43993ec0d38247149a1eaf012fae50e33e13e23500a2ee79906ce2262aa29cf079037a57509a733ce0f985bc911228285a SHA512 cd0f78e593825ffbad25db1c128552f336d0fd829bba2ab9761a2039570e5c14ee84d26fc4c36a895b8ae2743250b900095362d910f0a8c1fac21030fef64e7a
 EBUILD gcc-6.5.0-r4.ebuild 445 BLAKE2B 2f3d0d7d881671cb42296b53441f8c379bea95dcb83348fc9d993b1c586c828a82188ca39688a728a32e1d37f19a5bc5148e339654477c5383d90e29dc527ca3 SHA512 1c2fcee4393c001dfe1718ac6bc7ace20df0b77bfc9cf1c94683a60f3c0d42cf62b8e6afe4d8938937eef870083b7026491cc3c4952d67fa81894e543ec4653a
 EBUILD gcc-7.5.0-r2.ebuild 456 BLAKE2B 4d675d65bb34c51225f2f490409ed63f0f95a3f9bec9c1e034127ad0ac4fed7f104fc5febb761133873505807c6cc6b44b8ce8d51d0faef26843feed6cf1f933 SHA512 057ed372182d4bd5afb51459e0bc563fa05590feb5e0a859123a2d20d9f052cd23d2ac70923f58c827ebec3e419cfb6cb1d370feb58d39a02089fa3bd4d90921
diff --git a/sys-devel/gcc/gcc-11.3.1_pre9999.ebuild b/sys-devel/gcc/gcc-11.3.1_pre9999.ebuild
index b17d87e21b4f..68a2294f2ab2 100644
--- a/sys-devel/gcc/gcc-11.3.1_pre9999.ebuild
+++ b/sys-devel/gcc/gcc-11.3.1_pre9999.ebuild
@@ -29,10 +29,5 @@ src_prepare() {
 
 	toolchain_src_prepare
 
-	if tc-is-cross-compiler ; then
-		# bug #803371
-		eapply "${FILESDIR}"/gcc-11.2.0-cross-compile-include.patch
-	fi
-
 	eapply_user
 }
diff --git a/sys-devel/gcc/gcc-12.0.1_pre20220429.ebuild b/sys-devel/gcc/gcc-12.0.1_pre20220429.ebuild
deleted file mode 100644
index 3dca1305644b..000000000000
--- a/sys-devel/gcc/gcc-12.0.1_pre20220429.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
-
-PATCH_VER="5"
-PATCH_GCC_VER="12.0.0"
-MUSL_VER="4"
-MUSL_GCC_VER="12.0.0"
-
-# 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"
-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
-
-	if tc-is-cross-compiler ; then
-		# bug #803371
-		eapply "${FILESDIR}"/gcc-11.2.0-cross-compile-include.patch
-	fi
-
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-12.0.1_pre20220430.ebuild b/sys-devel/gcc/gcc-12.1.0.ebuild
similarity index 85%
rename from sys-devel/gcc/gcc-12.0.1_pre20220430.ebuild
rename to sys-devel/gcc/gcc-12.1.0.ebuild
index 06fc5aebd948..a31455eab708 100644
--- a/sys-devel/gcc/gcc-12.0.1_pre20220430.ebuild
+++ b/sys-devel/gcc/gcc-12.1.0.ebuild
@@ -23,10 +23,5 @@ BDEPEND="${CATEGORY}/binutils[cet(-)?]"
 src_prepare() {
 	toolchain_src_prepare
 
-	if tc-is-cross-compiler ; then
-		# bug #803371
-		eapply "${FILESDIR}"/gcc-11.2.0-cross-compile-include.patch
-	fi
-
 	eapply_user
 }
diff --git a/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild b/sys-devel/gcc/gcc-12.1.1_pre9999.ebuild
similarity index 97%
rename from sys-devel/gcc/gcc-12.0.0_pre9999.ebuild
rename to sys-devel/gcc/gcc-12.1.1_pre9999.ebuild
index c1e18287bd3f..8504e4c09af8 100644
--- a/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild
+++ b/sys-devel/gcc/gcc-12.1.1_pre9999.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-TOOLCHAIN_GCC_PV=12.0.1
-
 PATCH_VER="5"
 PATCH_GCC_VER="12.0.0"
 MUSL_VER="4"
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index d1c36d8d1e53..e1286e660875 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/exfat-utils/Manifest b/sys-fs/exfat-utils/Manifest
index 3bd5d4de7950..5291b4cf0221 100644
--- a/sys-fs/exfat-utils/Manifest
+++ b/sys-fs/exfat-utils/Manifest
@@ -1,3 +1,3 @@
 DIST exfat-utils-1.3.0.tar.gz 188943 BLAKE2B 07af437fc21ae2f7d99db778069135c7391554f964a05eb6df715bcb5135003ecdc1257c541a61e0c140bfcffbc0802dd4118413f8d11a175be3f8adf5f5b83f SHA512 e1c5b708f22e878d7521e3299866bba127145757e3620696ff11b18c8c7d4830522974e8ee4771234b70aa9718295d3433779cf34ca990e28ccc06cbf9325f7e
 EBUILD exfat-utils-1.3.0.ebuild 623 BLAKE2B 5605a3bf5b40bd0af6faa8335b49813f0aac71ea03a6f08724731171758f7513728aee99df55b1b989731e74d086978f15e1b2ad7106d711ee308908e79728d0 SHA512 6fcb2679f9edde16ca26d0fea80d6eeff5939e13d2c902145b981429a4318e1dbed3412b78b6fe0a6c4813d436975dd4b5e58291ecfb55ca0b8e01d5fc3c6473
-MISC metadata.xml 514 BLAKE2B ece21f809fed311427b04251ceb35d7c2d290c47402a6f02720ebb01d763071fec0691d7490e56130d104393bb3ed05c94613d55f7b23048d0e7f10f202ee955 SHA512 ea008a36ce2c7f84f5093b17c3f2f8c1a3cf84acfc4baa3f2c7b39a52359495ed52633861fa42fcadf70dd1cfbd730239c367c498d8ce0374767a8d0b6208b4e
+MISC metadata.xml 438 BLAKE2B 8e9a08139e7f5fe750dd1360945dfb0f8862a6829759cbed3123fe7ca6e2719fed051a766139510742c3f651dd397e4a07a2f0a1bf412c87cdbba8bd0e3b5c48 SHA512 73bb5c084e7a0a63e68977826256acfb18777ff987b8568a64eedd78f7888e90ccde8fb42d9d352182460d5ae9c08dd9fd5838f93b10df1aceb1ce2a01d7fc21
diff --git a/sys-fs/exfat-utils/metadata.xml b/sys-fs/exfat-utils/metadata.xml
index 69cf8f2172a6..f9ff4f860cea 100644
--- a/sys-fs/exfat-utils/metadata.xml
+++ b/sys-fs/exfat-utils/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>floppym@gentoo.org</email>
-</maintainer>
 <maintainer type="project">
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
diff --git a/sys-fs/fuse-exfat/Manifest b/sys-fs/fuse-exfat/Manifest
index 0ef758580fc2..0518ffbbaa6a 100644
--- a/sys-fs/fuse-exfat/Manifest
+++ b/sys-fs/fuse-exfat/Manifest
@@ -1,3 +1,3 @@
 DIST fuse-exfat-1.3.0.tar.gz 161278 BLAKE2B 864eed57d5ae70eac03464899ac7c63f5d55254b61b69064592bb7ae04f6c164b8113c568946103c407867c1b53511bf2b88bd6b25cf75aa3a1a9a2a7d4f12ae SHA512 90d2b89322590199012b035b88ae01559f1824172793d9e7845603940e2807e788c687e4958f1ef76678bd214bb03671b91fd2537901b6d6acf2e8c525a3f1f3
 EBUILD fuse-exfat-1.3.0.ebuild 717 BLAKE2B 25ad3696126ecb59889b5435b742796008f9a36f7e2df82c9c6aafae3896d2834abc26131d691bdd2778d0378e2afb65ecb65d2e914183cadd72bc3c5248152e SHA512 d4f5ddce19d6b3bf3ad4060051df85bcf76f189fc12f0a8741f9b293836f2025b0d6445340c532299296e0e7ed99b67a5929a56cc6f8d959f4a44098567c9920
-MISC metadata.xml 452 BLAKE2B 732e98008de6a9a56cf180645a47c4c17df8af53ca8b3f0840d1ab9cbd74e910baf3445b6fdfe6503e638ccd147d9bc2bde872d4392412f3dfbb82ce1d36165d SHA512 66101a85d733d256950dbcc3a5a6c3973584e0b6adb37979e2ac12a95d127313311a05e5b166eb047e0ca0641cb988cc86a1feed05f2dc45431cbeeee6be5457
+MISC metadata.xml 376 BLAKE2B 46a5e00037e6ccff0891d6e80d52037ff17903a7ebd46f98694a94af076eb4f049eec3b13b9bc6abc8f660ec4b08cd3157515b894f7127fb8ca95bfd0a2701ad SHA512 2ae5fefbe898baa37c64f59ab60e84b4bc7d93b6aa2c7248d59c1776a808b85b02fc105928adeaadb23adb3c8479a5fa074ffb8ab3f16a1da1f3ed5d47bdbfed
diff --git a/sys-fs/fuse-exfat/metadata.xml b/sys-fs/fuse-exfat/metadata.xml
index acba87cdba49..9b3ae497122e 100644
--- a/sys-fs/fuse-exfat/metadata.xml
+++ b/sys-fs/fuse-exfat/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>floppym@gentoo.org</email>
-</maintainer>
 <maintainer type="project">
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
diff --git a/sys-fs/xwmfs/Manifest b/sys-fs/xwmfs/Manifest
index fdd967a47d8b..7cadbde13483 100644
--- a/sys-fs/xwmfs/Manifest
+++ b/sys-fs/xwmfs/Manifest
@@ -1,3 +1,3 @@
-DIST xwmfs-0.90.tar.gz 199555 BLAKE2B b2223edb1befad1055d103c03ba8092ea6319eb7299ec9e74338567aef9e45071f056ebfaddd41bcca3722f2ad96122d5009890847b6a485ea700e1e43d2893b SHA512 70805bc509cd8ab11d75b0f9b303f76c6e7c0af7664eca4f9f1dc14c6d59d34a1bcf3e1ffde427b7f11740f1b52e7838c44a28de44fd96ca0bacb45c8b160a67
-EBUILD xwmfs-0.90.ebuild 616 BLAKE2B f630310a717239884218f3157011f36a7c6401f1d2ef14548beeb26973f07da4f4b37d35a8018cd1ee195d3e7bb08ca97f6a6933d4d669e1c35490802cfaf60a SHA512 6d453074bdfac44ee5127aeb94eb7f66ad2b56f1c508a493306b6b6ea50f5814163da255593562dc97cdeae7a2b0c64264825404eb482b944f21da0d7a797ea3
+DIST xwmfs-0.91.tar.gz 205380 BLAKE2B fe16fb42c255c8aa3f3a89c494ee9a0d89a4ec1f7d09299374b8891ecc03fe41bb676e2a65112d60abf7ea7e7c2b173aa1333969b445814b07f5c972c001969b SHA512 a2f86b614364c1ffd5fa591bdabd8940f9f317f07e5c4ddc45e8da44de1ae434cbe0336fd1ef7f25027c390388943a8cd03991546ffa640ffe5800a66792ac17
+EBUILD xwmfs-0.91.ebuild 616 BLAKE2B ccfc65eac426a8bcc7b964fc3c7898d9e8c2ab608e9610c677a0d953794fbd724f4688ec1e82eaa2da19bb2adad18847a9dc4bd4958500a20cbb76ff805a5497 SHA512 176b29a3b629d6e7a8c1d1f90c4cf3ba7e2ce94e6e16586692522a89995046c875358b41d862126adfe56759bc74ef2bc6a44d58ec8912c39d2a00eb23075f76
 MISC metadata.xml 1424 BLAKE2B 5420162977ac47dcf267b69d32c04c5e38f03b654afaf3a4af86fbc16e5dafda5c1855cba18612ed71161f153a4d55da1ee11b2cf6e3eb3a1eca5095828bf34c SHA512 e128f8bf372a60019c5be9e608506148f4d86db55ff484ee28748f54a10518c5555f9d217077e3de3b817e52de6b9308acfa4a6faed8c48bfc69119ee00e0196
diff --git a/sys-fs/xwmfs/xwmfs-0.90.ebuild b/sys-fs/xwmfs/xwmfs-0.91.ebuild
similarity index 93%
rename from sys-fs/xwmfs/xwmfs-0.90.ebuild
rename to sys-fs/xwmfs/xwmfs-0.91.ebuild
index 6f9d03e0f508..deecfb925e6a 100644
--- a/sys-fs/xwmfs/xwmfs-0.90.ebuild
+++ b/sys-fs/xwmfs/xwmfs-0.91.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
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index d346d15ab578..7186db859d70 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest
index 47dd38bb5485..82bdebfb0d87 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -15,5 +15,5 @@ EBUILD binutils-libs-2.35.2.ebuild 4100 BLAKE2B 521acb4f160e171efd6500aba598825f
 EBUILD binutils-libs-2.36.1-r2.ebuild 4053 BLAKE2B 1d2c9609ce0fa3aff3222d89ee237ba73d31515bb0032ffd8d6b6a9a04060aec1df32cb727572a0a20b9ba64834dc43c2260f3401703cb711d0d5516e136a3d1 SHA512 e355a34921f4a260f2f61a222365703b1afc103fc993e255801a8c2deec42409ba1aec8a22d734c38a4440c385b29f81eac52c4584431ee54d0cf0cfe611ff6c
 EBUILD binutils-libs-2.37_p1-r2.ebuild 4126 BLAKE2B 63dcef180b378d47d48f714e095ff2ce98dcd027de0d176c64179fcfe1f48df5f451468fb974176ade21914f4ba731487b91b03223eba11662be17cb3b42c9c1 SHA512 c659774de8238e81669507dfd5b2a565b5deaa8c54fe12ee02f5b3b204a147b2aea5bb9a6707930d0ac3ca10225ce486f294e510402b37c99ee1f6c170c31ecc
 EBUILD binutils-libs-2.38-r1.ebuild 4530 BLAKE2B 6fbf59602ecd890921c795d31d67559da3e36790d1f2976f25a8cfd4a8c644236870cf03e843c82e6ffdd74ba2386d43ee722c7aa5a421058eabbafa3585bc7d SHA512 42253acb4cd37d34c44af701bdd3c7eeba54409601e55ef5267370ff2cd76574046d32ffbf04921b64104df73ccb0a312a282cc4cc7d1d58cfd8d6d89063b951
-EBUILD binutils-libs-2.38-r2.ebuild 4530 BLAKE2B d2afeb416220d05ca02969a0df7186fc14d35577a003a5f3a13800fcebc3ae43cfef14f37186c1b1ec2caa9beda5c5760d4d442d6a8eca760cbdabdaa52de3b0 SHA512 de97702b7a2d39f9eca6d4d236822ba6c0eeeb71aac5d4d1b8d59433b6fca7796a5c30b7222721d7e9f04b8574268921f67b44081974ad91425cfeb4ad2f03a4
+EBUILD binutils-libs-2.38-r2.ebuild 4537 BLAKE2B d614a3575bbe8eb281eae46868e38475fd57e57349ca402a3853955683e86a196d24253d72efa819ed5c7b00b56f072f1cf602d654aeada2e67e047a5543da0d SHA512 b4f9362a4daa410c3141026c6e53b685965b62cf54accfb521d33f1deabb923a44a0d779dd673244cd6c9fe59b946868829af487119e53173d67d5cf7aa6f3bc
 MISC metadata.xml 612 BLAKE2B ceaafd9fd1421e9f3993e003d0029c92a78054c7a2b90bd78afc05370ad19c931c6a7c150545cfb7d57165168e0fdaf3a00dde1905b328826a91cbc70d9548a8 SHA512 c8d33bb8d1c62c7e95758624ed0febbc9d40e9f141bfd280837b3207bcd771412158d71c0cb5548d60be0b236f6fe103621daf7efa8875191982859b566ffa8d
diff --git a/sys-libs/binutils-libs/binutils-libs-2.38-r2.ebuild b/sys-libs/binutils-libs/binutils-libs-2.38-r2.ebuild
index 25f4aae57894..a48951d19c89 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.38-r2.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.38-r2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0/${PV%_p?}"
 IUSE="64-bit-bfd cet multitarget nls static-libs"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="nls? ( sys-devel/gettext )"
 DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
diff --git a/sys-libs/libhugetlbfs/Manifest b/sys-libs/libhugetlbfs/Manifest
index 4fb4b9fbcbe5..e1d8b6a02139 100644
--- a/sys-libs/libhugetlbfs/Manifest
+++ b/sys-libs/libhugetlbfs/Manifest
@@ -2,5 +2,5 @@ AUX libhugetlbfs-2.23-allow-building-against-glibc-2.34.patch 10055 BLAKE2B 38b3
 AUX libhugetlbfs-2.23-uncompressed-man-pages.patch 1515 BLAKE2B b43415a3059f1071f0fc04ec834cd51d87a8bd93f2df6b428a33296b1b55745f23861415a463d5899b12699c5f4a3e5bdd837a8ec2894d1fc89039924330d77d SHA512 ea3ef19a688866676315af59422233681a41338fd049cfa50ed91f660f0baf1950ba056b9fcd540e6694b8ec348c0d1fbb3aa6b8c1840e22a77634e26555c9bc
 AUX libhugetlbfs-2.6-fixup-testsuite.patch 1231 BLAKE2B e49ac448b4ac17a6ce9c32543e3ad7391bc8525e147d7a5100ef7ae15e4b0cf48b58ff1fe62d9a0fa61f142b7b8366228974c6628999edaa61d96114371bc09d SHA512 af9ee541ac4a30260e17baab1616cee13fdcc679ae3fdceed29ca6282c12a6b60d24b04bb61e3aa5f42092e017eb3bae59a56fd2b03954e40803f9f6f2cc4f80
 DIST libhugetlbfs-2.23.tar.gz 175459 BLAKE2B f469ff9a65364e9f0e04c11c8010c958855ebd4d50e1dd719576cda7c280586623404304be64a794907a5fb1d97bd9c0620a91d7a2492577e04fa40ff432b4c7 SHA512 fc9a7d59bcda9d3ca9c9e43a3a348f989c9cbdbbb77f21a43a06e71eacd05bbe5a7b2b51e20ae9ea00da9f1c4d1130da529bbfb702e8c9d11cab6efadd3dc168
-EBUILD libhugetlbfs-2.23.ebuild 4291 BLAKE2B dd55d833b540fce08d40672ce2ec9f43dd3e94559b60d03835240818aa6a0b55d20a2e6c58de9d49c95d820e5044aa883350143276c132440afd2f2774849d32 SHA512 c556504423ad39891bdc4622bd93a0b3d08ccf1603f5292419f2c91a961d372352e4cd519205c2b31dda3e12232764128f58d78b829b3ab0342c8a27a7c5d338
+EBUILD libhugetlbfs-2.23.ebuild 4291 BLAKE2B 7fd9c794f8c8051db041246397bb26cbb6d1501f23e21837442164ef1dfdf705dbd41ec26455e305a6515fd5280c95fbe04a5888637220e36b6f349f761a09c8 SHA512 b40f615e1cde2caa08bcbb5f10a36f5031f132abf5145725524fe76051766b5f27dbe81d18dcdadb6c010356afaa6ba95f9b42a38844ee13cd477313b0de94d4
 MISC metadata.xml 397 BLAKE2B 7b521a2822a494f6a2b7a85420a38edd396ca0e3856faeb682378c48eda3d1932788af7ac7bbb4e07cae37b2119afd386f75c5dc0ab1f69c8e4630be16cc549e SHA512 96065769a7893c1e05bc3ab9396eb01a60a293dac9b090419087a9bb5a152b2f291a950e8217ffcb7bed34262a5369119da469e22cc3171fdc0ad2b87ae6d698
diff --git a/sys-libs/libhugetlbfs/libhugetlbfs-2.23.ebuild b/sys-libs/libhugetlbfs/libhugetlbfs-2.23.ebuild
index b20145724f82..f31724207108 100644
--- a/sys-libs/libhugetlbfs/libhugetlbfs-2.23.ebuild
+++ b/sys-libs/libhugetlbfs/libhugetlbfs-2.23.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit toolchain-funcs python-any-r1
 
@@ -49,17 +49,6 @@ src_prepare() {
 	[[ -f version ]] || echo "${PV}" > version
 }
 
-src_compile() {
-	tc-export AR
-	emake CC="$(tc-getCC)" libs tools
-}
-
-src_install() {
-	default
-
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
-}
-
 src_test_alloc_one() {
 	hugeadm="${1}"
 	sign="${2}"
@@ -169,3 +158,14 @@ src_test() {
 
 	return ${rc}
 }
+
+src_compile() {
+	tc-export AR
+	emake CC="$(tc-getCC)" libs tools
+}
+
+src_install() {
+	default
+
+	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
+}
diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 79b4dd9c1c58..726c91142a7f 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -4,5 +4,5 @@ DIST libxcrypt-4.4.27-autotools.tar.xz 619240 BLAKE2B 13dd5730fded0684c8e7321fee
 DIST libxcrypt-4.4.28-autotools.tar.xz 618560 BLAKE2B c56d510201651e36cbd950b5a0a32273fdbce1f053109aa5867b2c6a57e2a896c34c981c1a2e732a8f34539b754ebe7f50d1b5bf59f9549a75ad6420921f3e1d SHA512 3c60fd32dea308152c4272522c29668c83e88bea47c98b9fe796ed70f5460ad2a9616ffbe789c03e417b28d3c792361b16031bda3d8bc5b6c06f0ebdc66c8217
 EBUILD libxcrypt-4.4.20.ebuild 5797 BLAKE2B 888564715e7df7e8d19461ec5e9654ec6b0423148bfd6c9169d61cd12ebe30a6c8384092748bc5459be370b7bad0d615883dbfc51a5dff28abbd43ad57e79199 SHA512 dde0ff01e886294442779aea22148a8ccf17c47357b379f7d3c93ea49412233536a61972197909759b4957deac66afd703056a8c658f6b40fe78b85b85d0c930
 EBUILD libxcrypt-4.4.27.ebuild 6394 BLAKE2B eb7f84bae0267f33a4f3ea17af79891802395eb361cf04565de6d9fafd31f8ca58bada24cb9c54bbae5ef171b822f4a63c94d777a8f81b69369faf40cc1ae2d0 SHA512 415b9151344e36ea65262fcdf51e3dd37c6e3ab11a2ecf15a575b2cf18740aee168c61f4502409d5d7617b8bc17f38c5decacc013125018ec72841f094b63fc6
-EBUILD libxcrypt-4.4.28.ebuild 7314 BLAKE2B ca7648d385038500790eebb515ce710c6aad22e7b34125df3c189fc7dc36646f4ee581b13b37bcfa8e8358e98f0d460987a4354651999b160291381b264eb6e5 SHA512 9aee84df67af33658d1c3c9432c949331a2cad05bdefe3f22773bbc1a8d524f589c0b215906ab11c9806a6de4bcdbb5010374052b1e6f56118eb872ba4b7e1b5
+EBUILD libxcrypt-4.4.28.ebuild 7323 BLAKE2B f8732eb91bbc1dad9592e7440acac3e47ac18521fd39bfe47a6addde931fda3062cacb78a0993e7c1048b811b59f2f65055dbff9840b29e20ac40a6934fc1658 SHA512 4d68220f64b061a51644f7f35f2be09857d5ece5e2a0a4e18d2a35a270feb59b7794b7d161d7241d826ad7abeff1ca12ad03d73b827fc5c9fcfd2ec9cc70cbb1
 MISC metadata.xml 831 BLAKE2B f8761f3758acf79afea36926a6488afb73c433a8faa599aa09a3bbc01b6c733d7264d7b584606158312825f099a1176623c70625a317a837de5bb20501f5ed22 SHA512 826ea578d9d3e651767e8f670d2bbb918c11e26ca5dc1c52ff7fbd513c39bee2d9423ecf16e47e2603f5a8c7b6979fd27eacde84182deb5a67004c9a3be281cb
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild
index f4a2b797141a..50aec10c1952 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild
@@ -39,10 +39,10 @@ is_cross() {
 
 DEPEND="system? (
 		elibc_glibc? (
-			sys-libs/glibc[-crypt(+)]
-			!sys-libs/glibc[crypt(+)]
+			${CATEGORY}/glibc[-crypt(+)]
+			!${CATEGORY}/glibc[crypt(+)]
 		)
-		!sys-libs/musl
+		!${CATEGORY}/musl
 	)
 "
 RDEPEND="${DEPEND}"
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index bc0469b10019..8c7d58028e1d 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/dotnet-sdk/Manifest b/virtual/dotnet-sdk/Manifest
index 53d929c5960e..ba38c5a219a6 100644
--- a/virtual/dotnet-sdk/Manifest
+++ b/virtual/dotnet-sdk/Manifest
@@ -1,4 +1,4 @@
 EBUILD dotnet-sdk-3.1.ebuild 289 BLAKE2B b9713987c33d4ecfa0a81c8dc8dfe61b9e964244de965e51807d7b9f6267628652954485163559879cf500418e8a5588a4e1f2c71375dfcd6b8b28968c078582 SHA512 cb35479c4e3ab57abda74f7a0dc8e00f459b1045d90da3f34da545456e339cf3fe46343b595a30bc6a7f5b2b5bd137139c22445e370036afa870cc7f6850c8e4
 EBUILD dotnet-sdk-5.0.ebuild 289 BLAKE2B a8152c30834c4156971d094d98048e4f5f6da33afe5098ab59f39830666c08cda94174c5fb1a7944f2d2c42a3381ae5b135e8f35a806f41361b8fc3f00ecee21 SHA512 030a413cd03b9bee63c086eb9a3c208e8fcc16de28512424c07746cbffd195a2c4c83e92d9c2b4615119d31a601b29096c8ed8779ac487e339c6f3379d246bc7
 EBUILD dotnet-sdk-6.0.ebuild 289 BLAKE2B 56abcfd89f47e77d847f01efd2ce2f618faf44f954874cc6f2b8b6190088a27f8541412d35d5f9dc367d98759a1c1ac6a738492ed399e9d7ca9d71801a425034 SHA512 a8b64cf99b11c437fb8310fb0671ebae70c7ee071cba0d587795f6b4801cb719d72e0bb357f305de85e48a5d25dc7dbc92af8913da93ab1e8f00c3b66d7cf8e8
-MISC metadata.xml 243 BLAKE2B 6c826534a6d5f2b32160907b8c8a4cd1191694f02e26ec9588c2bf34a07a1e2efefb4d0251bfa20477c81fdd1b4ebdde66efcdcd89f8d887dbe615e72bc03a5d SHA512 a48581a28129e4d5ba29cf4ea87539252fa09c376b16ccb66eb1f4db92e23ce096ea05d28602bf5a4e30ba9399f5fddcb5799a9375aeb44e0b6dc35bfe50a91c
+MISC metadata.xml 276 BLAKE2B 5860f9ffa69b30c7083235d747cdbbe93eb3754dd475d0262380c70b8ef6d349888c3a2f80de034e2906d780d2b04b577f448f77eeb51ed02c7573bbe208588c SHA512 90a6b51d991c8bf58d8b7400535cf026f8d9e4bb06287283d6ad2f54a50a4fca5e771fd5d208c197b12287eace07c4152616b21948ccd145afc6c13cee6fd8a2
diff --git a/virtual/dotnet-sdk/metadata.xml b/virtual/dotnet-sdk/metadata.xml
index 7a3c482f8765..90230cd30053 100644
--- a/virtual/dotnet-sdk/metadata.xml
+++ b/virtual/dotnet-sdk/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
 <pkgmetadata>
-	<maintainer type="project">
-		<email>dotnet@gentoo.org</email>
-	</maintainer>
-	<stabilize-allarches/>
+  <maintainer type="person">
+    <email>xgqt@gentoo.org</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <stabilize-allarches/>
 </pkgmetadata>
diff --git a/virtual/perl-IO-Compress/Manifest b/virtual/perl-IO-Compress/Manifest
index 722bfb408106..d506ad9e178d 100644
--- a/virtual/perl-IO-Compress/Manifest
+++ b/virtual/perl-IO-Compress/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-IO-Compress-2.102.0-r1.ebuild 731 BLAKE2B 8daed2d1f2da5cd729cf653bcf9175b55b625e0adf70fc554473ab62d47f8a6ed7439c78ecf910e3af8f76450851c64fb82d273fc37751d535f50169781301b1 SHA512 8ef6b8089ca54baab2e2f44b226eb4d463c4b562398a3dc9e15b02827778100e1848b681e1e6b1414cd083e9518a3f2975aae1771b059fc742075e8f19d18599
-EBUILD perl-IO-Compress-2.103.0-r1.ebuild 716 BLAKE2B b7d8ecab699377dcdf99a9297167eb0b56988b3fef8940f185bfb8b2abf5666c34193078d5d1ca20d14ef00d09ea1d748d7f4245dc945ed430de2dbbce520163 SHA512 b99db6d0c66c2e7e9dba82cfdd533b1f568a21693adf57f7f78386c50dbc3d1f628060ddb138c085a068a69a3565c218609d11daec0b8ee750f6a5227b1c79e6
+EBUILD perl-IO-Compress-2.103.0-r1.ebuild 723 BLAKE2B 00672b79168f2895991dfbbef3634672046ca5d25d5687b8cc25da45c982a0690d0e1c082167c714122b9c6e2e028b76f21f00b39c573a3e65a76e62fadaaf1c SHA512 8d672e778f750624e7aa57e944b4fc65e2fc1e199fbb73a23bab85c7b5bdf4bc26f0ff287cef1ea1417dfa75d36a4c443d9e64dd86dfc7f9cd54bea3f0ad591d
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-IO-Compress/perl-IO-Compress-2.103.0-r1.ebuild b/virtual/perl-IO-Compress/perl-IO-Compress-2.103.0-r1.ebuild
index d099125719c3..41be76e69d7c 100644
--- a/virtual/perl-IO-Compress/perl-IO-Compress-2.103.0-r1.ebuild
+++ b/virtual/perl-IO-Compress/perl-IO-Compress-2.103.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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"
+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.34.1-r3 ~perl-core/${PN#perl-}-${PV} )
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index bb90286611cf..60657f9b5dd3 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/element/Manifest b/www-apps/element/Manifest
index f908a1929ed3..259a0a2b66db 100644
--- a/www-apps/element/Manifest
+++ b/www-apps/element/Manifest
@@ -1,7 +1,5 @@
 DIST element-v1.10.10.tar.gz 17541812 BLAKE2B 16e59f00f9fd0d220a00093a241a36c2b1c52b745545b66c9ecb57956eaf3b27fad871faa15c19c219de8d0f111392f17ccbc34bc71c969cc08bc7333ccb7af9 SHA512 dc7ab99d93c0aae71806b176340663a5f59cddc4b00ac7ed423a689f28d812db472398f75d1e0787a2a666ac9121544e1aba41d8550f9dc34b583d852eb74dad
-DIST element-v1.10.7.tar.gz 17249694 BLAKE2B 17e9e5e7814ca13a6be03210ace71036c4d86d3f7aa11ba4e42d6f2d29420f17fbccbeb319159358ae941b3c8b01954fbcb93ab96ea75edae57866abfa3068f8 SHA512 9ca7856700ce173e653508170fafb4193aeb865c68da2c04b58088f65e4204516f080f26239a08b738a74de7eae1ff09c7464d4a6294cf03b27872ed0be78ca9
-DIST element-v1.10.8.tar.gz 17345607 BLAKE2B 989c389901f61e06a7b164e0ae9c332a018abb63ded874479be1231f4b77fba6b5adc67823d571a15c39f6831c6b661f4cc67ada2fe9a3429920b2e9d3d4e734 SHA512 e113d3df025f0519cd26247a9428efe08318078b167ba8d831d26a922adc7c75e6846577fdff21fcc4e54ba5335a4beab718ee114b91868db2b64c5630da79c2
+DIST element-v1.10.11.tar.gz 17554189 BLAKE2B bbd61969a8d0513b311ab65a99a83b1d4d9d4b5be39a492ac57726b86a2f84e32d4e71e95601d6fb95bf9f549b81190bbd995a8b481ab23ac69d898c82cf8e2c SHA512 003f865ed5e8ab89d8427338229af944123222e5f36dac10432e7f83beef20b992746a69a39f56ecf3bcc722644eff387d663f327b558620061ec43114a1bd63
 EBUILD element-1.10.10.ebuild 733 BLAKE2B db476c59066c1360f4fe92bbfeb929e00853f79b28a8d7c18f34422fc8f4aac859ca5df21397ce4b94ff0ebdcede08eafe1584dd97d36f5e4ef31096ba785af9 SHA512 8b355b00e7500aa8529d6f2e7539e571940dbaf4200d736d549fd0da5da9f05eb2fd3cc527e8d1692067d9aa0cf709985105250b8854f5882f42bfbb97f2fc52
-EBUILD element-1.10.7.ebuild 733 BLAKE2B db476c59066c1360f4fe92bbfeb929e00853f79b28a8d7c18f34422fc8f4aac859ca5df21397ce4b94ff0ebdcede08eafe1584dd97d36f5e4ef31096ba785af9 SHA512 8b355b00e7500aa8529d6f2e7539e571940dbaf4200d736d549fd0da5da9f05eb2fd3cc527e8d1692067d9aa0cf709985105250b8854f5882f42bfbb97f2fc52
-EBUILD element-1.10.8.ebuild 733 BLAKE2B db476c59066c1360f4fe92bbfeb929e00853f79b28a8d7c18f34422fc8f4aac859ca5df21397ce4b94ff0ebdcede08eafe1584dd97d36f5e4ef31096ba785af9 SHA512 8b355b00e7500aa8529d6f2e7539e571940dbaf4200d736d549fd0da5da9f05eb2fd3cc527e8d1692067d9aa0cf709985105250b8854f5882f42bfbb97f2fc52
+EBUILD element-1.10.11.ebuild 733 BLAKE2B db476c59066c1360f4fe92bbfeb929e00853f79b28a8d7c18f34422fc8f4aac859ca5df21397ce4b94ff0ebdcede08eafe1584dd97d36f5e4ef31096ba785af9 SHA512 8b355b00e7500aa8529d6f2e7539e571940dbaf4200d736d549fd0da5da9f05eb2fd3cc527e8d1692067d9aa0cf709985105250b8854f5882f42bfbb97f2fc52
 MISC metadata.xml 253 BLAKE2B 8557c513beef73e834b0a000c523a3241da961c6307b6e98ac857dad0888c4bbd028c98f8499f01086c24e8f2f57c64bc75db20154dab232adefc2510fccac03 SHA512 67dd372ef7b684101d9198c6199a6403f8750132d80aab4f4daa4b31ebaea3d82eb9a18e904734e2ac10c77b237d67210055949ff1c6d5aad4f75951a096884a
diff --git a/www-apps/element/element-1.10.7.ebuild b/www-apps/element/element-1.10.11.ebuild
similarity index 100%
rename from www-apps/element/element-1.10.7.ebuild
rename to www-apps/element/element-1.10.11.ebuild
diff --git a/www-apps/element/element-1.10.8.ebuild b/www-apps/element/element-1.10.8.ebuild
deleted file mode 100644
index bdccc2ddf91f..000000000000
--- a/www-apps/element/element-1.10.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit webapp
-
-DESCRIPTION="A glossy Matrix collaboration client for the web"
-HOMEPAGE="https://element.io/"
-SRC_URI="https://github.com/vector-im/element-web/releases/download/v${PV}/${PN}-v${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-need_httpd
-
-S=${WORKDIR}/${PN}-v${PV}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	dodir "${MY_HTDOCSDIR}"/home
-	dodir "${MY_HTDOCSDIR}"/sites
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/home
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites
-	#webapp_configfile "${MY_HTDOCSDIR}"/config.json
-
-	webapp_src_install
-}
diff --git a/www-apps/miniflux/Manifest b/www-apps/miniflux/Manifest
new file mode 100644
index 000000000000..212b777b1af4
--- /dev/null
+++ b/www-apps/miniflux/Manifest
@@ -0,0 +1,9 @@
+AUX README.gentoo 2168 BLAKE2B 2291976288e00d71ecf9b978874cd26a33d604f803c6eb511e137e8a9843e4c7b64d286482c9af47879fadfe1d800cd58e4d09ea1882d436eff528d8aaa9743f SHA512 edac844eb081472d6c8054d9bf0f8661cbbb61455d2cc97ce7d05a842fe735b6e130f1b6d0a2e26737d153624b5a7451b362e04247b366c090f2fc3e9aab7391
+AUX miniflux.conf 809 BLAKE2B 4465c338fa13d3465731fcb98616d08d4fbcfdad6e10eb3f089de62dda9297220b92cb767bd92dfd97c3a5a5f6a2bd87444b76fa790243626d77698ecefcc2a1 SHA512 470b0e8382b97c2c2d1c8a2c6865a8cd06b2157a24d81a329d6de37d9b964b502a37ca7178090f2aee5c29210fc4c6e4f7d7e2245d00d8df33cfc738012b7329
+AUX miniflux.confd 171 BLAKE2B 2d38a12678c7873ac31473a2160d1416d168e384c519fe48feebf4ea3d4e6c734ff198e652df8b0af7da5c3543eff5321a02b6991de131d746b89e3b5fb7db08 SHA512 13b43595e7a5bca01b9fbff9fc6979d408b32109bafc23cfae29a9470b5333a244ee1f1bc94ba436d93e2d2c55640690202ac1201884f9ea5499fa0161af059a
+AUX miniflux.initd 504 BLAKE2B d43cc0323161fc3723063f07fb5d8da4f762b420dedbcab28ad5d41c90f526c80849222f9255032fdf9fc4c4ba45d4989d0967498a5e32b326a6d966abaa4c84 SHA512 d58233009fd6c69f1095aa5cc62d08a910edaa0d16db3af663398d723873f2354e0d60c75ca746a281546d1f40ad0a8db1fc275ee31ed9e6958410b0b5f12afb
+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
+EBUILD miniflux-2.0.36.ebuild 2535 BLAKE2B 74d6cb73e9320caa5146c05788f6c0c438640ef07717825e38efa5f4d57c9bc93d2777c3f81625123e9c80cdd0dbed42ce032dec25d9413a65d64accda0f9d61 SHA512 512e8154358c1a6604d7dc304c206ceeb8ccce5a02bfbbfa25f1425ea6467adf6a5fe2f604f3bf8c64ea3035f2149678c23c2e853d668d2df425960a44e3cdb7
+MISC metadata.xml 329 BLAKE2B 50e914926db603f0d6e89f009847cab4ed7e771c33779da94e71d78dd4322457a19c8b1f4d9a27670fcde68ffd4480582c8def09973b84cc69bcf670fabfae19 SHA512 c00ceaf0e7d32f4395cdba01ce2af24ce7ab2d50baa250abe035f78d905b864fc1e0947226fce655adb5b0355030b30adabd6c64d306b83a5b8f6aae70dcdbcf
diff --git a/www-apps/miniflux/files/README.gentoo b/www-apps/miniflux/files/README.gentoo
new file mode 100644
index 000000000000..7d236ffadfb6
--- /dev/null
+++ b/www-apps/miniflux/files/README.gentoo
@@ -0,0 +1,76 @@
+Introduction
+============
+
+Below are some common tasks needed to administrate a miniflux instance.
+
+
+Create the Database (Example)
+=============================
+
+# Switch to the postgres user
+$ su - postgres
+
+# Create a database user for miniflux
+$ createuser -P miniflux
+Enter password for new role: ******
+Enter it again: ******
+
+# Create a database for miniflux that belongs to our user
+$ createdb -O miniflux miniflux
+
+# Create the extension hstore as superuser
+$ psql miniflux -c 'create extension hstore'
+CREATE EXTENSION
+
+
+Create the hstore Extension
+===========================
+
+To create the hstore extension, connect to the miniflux database as any user
+with SUPERUSER privileges (like the postgres user) and run:
+
+  CREATE EXTENSION hstore;
+
+Alternatively, give SUPERUSER privileges to the miniflux user only during the
+schema migration:
+
+  ALTER USER miniflux WITH SUPERUSER;
+  -- Run the migrations (miniflux -migrate)
+  ALTER USER miniflux WITH NOSUPERUSER;
+
+
+Create the First Admin User
+===========================
+
+The easiest way to create the first admin user with your new miniflux instance
+is by running:
+
+  miniflux -create-admin
+
+Alternatively, set the DATABASE_URL, RUN_MIGRATIONS, CREATE_ADMIN,
+ADMIN_USERNAME, and ADMIN_PASSWORD variables in your config file or run miniflux
+with these set as environment variables. For example:
+
+  export DATABASE_URL=postgres://miniflux:secretpassword@db/miniflux
+  export RUN_MIGRATIONS=1
+  export CREATE_ADMIN=1
+  export ADMIN_USERNAME=admin
+  export ADMIN_PASSWORD=n0tAstrongPassw0rd!
+  miniflux
+
+
+Migrating the Database
+======================
+
+On upgrades, the miniflux database needs to be migrated to the new schema
+version. This is handled automatically when you run 'emerge --config miniflux'
+but can also be performed using the following manual steps:
+
+1. Export the DATABASE_URL variable.
+2. Disconnect all users by flushing all sessions with 'miniflux -flush-sessions'
+3. Stop the miniflux server.
+4. Backup your database.
+5. Verify that your backup is really working.
+6. Run the database migrations with 'miniflux -migrate' or set the environment
+   variable RUN_MIGRATIONS=1.
+7. Start miniflux.
diff --git a/www-apps/miniflux/files/miniflux.conf b/www-apps/miniflux/files/miniflux.conf
new file mode 100644
index 000000000000..7a2b217f598c
--- /dev/null
+++ b/www-apps/miniflux/files/miniflux.conf
@@ -0,0 +1,22 @@
+# This is a sample configuration file with the most commonly used options needed
+# to get started. For a complete list of available options, see the miniflux (1)
+# man page or visit https://miniflux.app/docs/configuration.html
+
+# Toggle debug mode (increase log level).
+#DEBUG=off
+
+# Postgresql connection parameters.
+# See https://pkg.go.dev/github.com/lib/pq#hdr-Connection_String_Parameters
+# for more details.
+#DATABASE_URL=user=postgres password=postgres dbname=miniflux2 sslmode=disable
+
+# Address to listen on. Use absolute path for a Unix socket.
+#LISTEN_ADDR=127.0.0.1:8080
+
+# Override LISTEN_ADDR to 0.0.0.0:$PORT (Automatic configuration for PaaS).
+# Default is empty.
+#PORT=
+
+# Base URL to generate HTML links and base path for cookies.
+# Default is http://localhost/.
+#BASE_URL=http://localhost/
diff --git a/www-apps/miniflux/files/miniflux.confd b/www-apps/miniflux/files/miniflux.confd
new file mode 100644
index 000000000000..2448e5069f78
--- /dev/null
+++ b/www-apps/miniflux/files/miniflux.confd
@@ -0,0 +1,6 @@
+# User and group miniflux server should run as
+MINIFLUX_USER=miniflux
+MINIFLUX_GROUP=nobody
+
+# Config file the miniflux server should use
+MINIFLUX_CONF=/etc/miniflux.conf
diff --git a/www-apps/miniflux/files/miniflux.initd b/www-apps/miniflux/files/miniflux.initd
new file mode 100644
index 000000000000..f8a8c59132da
--- /dev/null
+++ b/www-apps/miniflux/files/miniflux.initd
@@ -0,0 +1,16 @@
+#!/sbin/openrc-run
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+: ${MINIFLUX_USER:=miniflux}
+: ${MINIFLUX_GROUP:=nobody}
+: ${MINIFLUX_CONF:=/etc/miniflux.conf}
+
+name="miniflux daemon"
+description="Miniflux Web Server"
+command=/usr/bin/miniflux
+command_args="${miniflux_args} -c ${MINIFLUX_CONF}"
+command_background="true"
+command_user="${MINIFLUX_USER}:${MINIFLUX_GROUP}"
+error_log="/var/log/${RC_SVCNAME}.err"
+pidfile="/run/${RC_SVCNAME}.pid"
diff --git a/www-apps/miniflux/files/miniflux.service b/www-apps/miniflux/files/miniflux.service
new file mode 100644
index 000000000000..5480dd01e603
--- /dev/null
+++ b/www-apps/miniflux/files/miniflux.service
@@ -0,0 +1,22 @@
+[Unit]
+Description=Miniflux Web Server
+Documentation=https://miniflux.app/
+
+After=network.target
+Requires=network.target
+After=postgresql-9.5.service
+After=postgresql-9.6.service
+After=postgresql-10.service
+After=postgresql-11.service
+After=postgresql-12.service
+After=postgresql-13.service
+After=postgresql-14.service
+
+[Service]
+User=miniflux
+ExecStart=/usr/bin/miniflux -c /etc/miniflux.conf
+Restart=always
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
diff --git a/www-apps/miniflux/metadata.xml b/www-apps/miniflux/metadata.xml
new file mode 100644
index 000000000000..6ae1ef592e60
--- /dev/null
+++ b/www-apps/miniflux/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>concord@gentoo.org</email>
+		<name>Kenton Groombridge</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">miniflux/v2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/miniflux/miniflux-2.0.36.ebuild b/www-apps/miniflux/miniflux-2.0.36.ebuild
new file mode 100644
index 000000000000..7352330614f5
--- /dev/null
+++ b/www-apps/miniflux/miniflux-2.0.36.ebuild
@@ -0,0 +1,96 @@
+# 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"
+
+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-client/Manifest.gz b/www-client/Manifest.gz
index b86787d840f9..9b373aad04e3 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/chromium-bin/Manifest b/www-client/chromium-bin/Manifest
index e6084e4ef370..97d8063c7ac1 100644
--- a/www-client/chromium-bin/Manifest
+++ b/www-client/chromium-bin/Manifest
@@ -3,16 +3,16 @@ AUX chromium-bin-browser.1 4898 BLAKE2B 0660c64d019f681c49489676f858e3acedb6f982
 AUX chromium-bin-browser.xml 425 BLAKE2B ca10cb376c379f8a233863e445f1625437f54493a3a67a29e5f26d3f80030c4deb2fe5d151dc6991012e6c9e3c8c7c7016fab507819fa77352183fd9e29cb8da SHA512 a583029ee59cbf9541ff89c7a879780cb0801d43aff06b00fa52bd34cbcd49142c46b13714c6527507470ec549378776223f9578140d87769ecced67467667f9
 AUX chromium-bin-launcher.sh 1247 BLAKE2B f07f6f767ce4a8724b9a478b45abac358c1a2fcb208666744579c5c915ce5afcff01ab380883c9f6b593374963edff65fd54005ae15e60390bc97fb16e21da8a SHA512 41a04e1eb1ba97c19783f173fa11745efe9e31c3163a0867ad27627000155fcf8c3aaaafd468845f665b919ca41946a112365c5c95fec4a4347888d6e6137835
 AUX chromium-bin.default 164 BLAKE2B e2a3bbb30fa7d98cbcdfb117af9ae480b25c84db334884ef3a798713b8f85db366a9076f3d4c84523c808c0b02c06837e13f00bd0bc99814d9239a742a1f1f7e SHA512 77a012a4ff7c883750e09830841a9900c9eb9c0ccff04f4064066a7e64fd04868e19a54da7fabe954c78b6333c19eef498b5a7b8f0ccf599198e70c8a8e362db
-DIST chromium-bin-100.0.4896.127-1-common-aarch64.tar.xz 11875048 BLAKE2B ac468307a934cfe5889cc533df343ede80a099d251769b8a3593309b41cc54974ac9efb42562a7ca878b1a3e0bc7b4c46056a16df3e3ff2c2e32afadc06fe414 SHA512 2c413e688ed42151b42f0205221b7bfa983a82eb8ac97936a8326ec022ba598d45ffde0d500c05823368e241de0ee92c3c050a5fd9943c80c11783d56ca47d0e
-DIST chromium-bin-100.0.4896.127-1-common-i686.tar.xz 6964920 BLAKE2B ef6b0dc25e9fc60d979a3c35e5e4910088ff2e4006c4a4d79665d01a77d24ef2dc41c51a1c9309575aced89a7e3dbecaec1e0318fa3141a1142a27bff5710404 SHA512 9eda977be0adb074156a46c6989117776765e2b7f788199c5ca6546c0654a06195f89b2d399edaab5804ce5adc5845026aad1fa09e38cf8b46e83bd21634ec1b
-DIST chromium-bin-100.0.4896.127-1-common-x86_64.tar.xz 6940900 BLAKE2B 64bd1d9535fe7c6f0685e5fe954a42cf905e2942bffc294bc5ca25a5e6d66b50994df12a42ec8d81b98ee0eddece3734a2a9e15ba69745008dbb744e3811c005 SHA512 1b33e045a2408dd6bcaccc66e07794a5302eacf2d32ecbedb040a4a7283df4f67cbf6f4e0de2b38ca38b3feaaeb0687f4533bb3b20d77026b2698a36bf56e680
-DIST chromium-bin-100.0.4896.127-1-common.tar.xz 4494756 BLAKE2B 64038fdbc89b1a5a5bf6bf1ee54d0b903b9cdef78f738c3eda246395089a2dde5beeb13417dc2a91a230a1781926c9f8ec58451a31cd1d4638ac8610c04103a1 SHA512 bf3034017e7d050f0bafa707db2e174e4f282827f2e874704cac38fdf0307e4954e8632400dda6d8f90364f032d1d9d725a1d3071213b7d7b66f445cc4b2ff66
-DIST chromium-bin-100.0.4896.127-1-l10n.tar.xz 4487460 BLAKE2B dc8c7e93119936c4928e8eb8cc7aa519b91063b601e60f6452909a749e5c05a85cec4d0e389f3fbea747877250a6e30d6d2032718d9c8eb35ae4a8866103531e SHA512 525dc12ada9ce3e8ee4378949c1c5c4b989dea1a6a5fc2f6bfe0acf35503a67836da54c388039fc0b45ed41e582725d29692500e727e4d5c3c5b9236454390da
-DIST chromium-bin-100.0.4896.127-1-wayland-aarch64.tar.xz 81901876 BLAKE2B 47f4339bfd2f8388605282e22f347e02653aafba16864ee40084e92e0f126b3684770691f1c1ed8c1380f1c0c5360e356df0478044858eb30f6a9de4e2bd05ab SHA512 872e178e8b639be3ceee4740ccd212be7c7c83811a4150d184761245c7c484229c788399ec3b08f34741c909d6f3e0ef86a6636d7d2a5d34e3fc1691e4e502eb
-DIST chromium-bin-100.0.4896.127-1-wayland-i686.tar.xz 85409236 BLAKE2B c080ca14d9203400d9318989e7e4446793c5bcd01a4e109b2a78a9c466403c179f09afc8b694b33a2eee4b193094f40abb1ded51ce7a86494f764b3e9d6b4c29 SHA512 6fd373ba3f1fae25579aad9cf80947e502219c71089494f934f80de87f5c67bb23b962b85ef52a4413e86f86324ecccfa0a51632ba21400b81da34471c024f66
-DIST chromium-bin-100.0.4896.127-1-wayland-x86_64.tar.xz 82854988 BLAKE2B 09047ca8eac01ece40c0efb8345a0be8231833f89aed2d347f1fe8aaadb7caffbdf7d744b441086ba3afde4e6d9afeaf74f3f1135f92685ba3834b644770b025 SHA512 ed024f0eea17dcaf0beb50a5db71b1f22d57ee3a6e98b2054698c4a9e568370f073934272b27550ef4f427794e4f754a9afdcbab5232a6898400024334c26cea
-DIST chromium-bin-100.0.4896.127-1-x11-aarch64.tar.xz 81697336 BLAKE2B 78723cb697723ee10bfa2378144ad56aa5312de49f59bfacd4442e9d251a3484ea4f04f9895b9ca04064ff50e652a1130c5d22fc04f0fa2d820162710187234c SHA512 e76334d52251cb1b31b5094b2b1542469075c3d9eb3b734a12df8a0d206306a63d052f3318c180ac1b79e84d634680c7dc616cbdfde8289b0a9a5b276b221a35
-DIST chromium-bin-100.0.4896.127-1-x11-i686.tar.xz 85215852 BLAKE2B 7e917efd81ca44c74c4586c5c5fc81d0d0bfa3630431161a9279ece6e88c9066ef3b0d96875e2a91ce7ef18115b1fd8ddf96433eb89f4344eb49e655b1fa6dfa SHA512 10a708659c96e0cd93a83930359a2418a4905d7ce207356d9375389d1dc079e16857518ffac08725b4c83bced7fc17ff0ff853821bf47ad11ae8d87e4cd124d9
-DIST chromium-bin-100.0.4896.127-1-x11-x86_64.tar.xz 82670560 BLAKE2B 7df224b936a467ba03d128dffe5e41292ab07002bc7e7c873a05f9f33aab91a17628fc0c06c50bbbd7fe0233e33981760fefb74a44aa02d5b3ad4c563b7cad9c SHA512 8b51c23741c2040f3494649b7eace9358b264c322d5f31b468963aa1dd9d3e8749e1acb2edd37eb454982d1ded0405a7d950da632775d369483ed9d53343f076
-EBUILD chromium-bin-100.0.4896.127.ebuild 7336 BLAKE2B 6efd886be0aed414872dcbdb3dd42c8d735776a5ccf67fc60f25ca9bfcad6482363f70e54ad40513cc5c47a341e51514e1ccbbcbf1ae5ef05581536451a2bd73 SHA512 7a695e0ac724838b9718289830b0f528393933525a546f82b82cf66a578b505a0105af360adc5eedcf8c558643fa410f4277e244cf5ad0aff89015e353ca84b5
+DIST chromium-bin-101.0.4951.54-1-common-aarch64.tar.xz 11959344 BLAKE2B 58b0e96c4f30e7716cd50472d9b2ecb55aa11702d6f11f339c485d391a50e4dbdfef6e795b229416edc85516c5af9f5837e05d7971dcf18c4772a7026fde147b SHA512 13457021b922b34edc4e801b9c3aae838adb37cb18725a272a9de4766478e62a1ee0c95cf69842c08d54d8dfb0109d781735d3ba2429bcbda77bb06d9e4d1b97
+DIST chromium-bin-101.0.4951.54-1-common-i686.tar.xz 6982160 BLAKE2B d9eff7fd4b74b6a01b7d360b9ccb074af69d7da85c22a9be1cbcc4559b82ae770c7157d0c5e656b8c8f5de7951b616cfadb4957172c69ccef8ef031d7e8001e1 SHA512 d3c3ebc29e8a7f40b341bcab7e2ff63df7a29f5aa5efa5f13f51a4a48572f2ae0006a98d103a18cdbcdbd6d7b939b9d00979ea697bc2ec928a23033191307228
+DIST chromium-bin-101.0.4951.54-1-common-x86_64.tar.xz 6985372 BLAKE2B ac82209867e7228b19286c028eb2f813e5dc9d43712658af723b288523a049f1d8729da9ff9c678d9759714ce7e2d484a42f2e8d9774b2319e46aa664fe6d8b7 SHA512 ede7811b7b76a922fa8e85cdb3a3d30f54535da45cc0dfe45bcfc1c42ae439675bbfbd45f94a0a7ccb4ee0df29f660554218ed413587a871e36d11935534db20
+DIST chromium-bin-101.0.4951.54-1-common.tar.xz 4506708 BLAKE2B c686f6b8513b3a4fb91a0dea69f7e66b98d7e18c75659e5181ddedf921b87702ce31ff329091709bef134a157d90c307f096d305d2b652073efa60cbd5e0a40a SHA512 44f6ccb0598591028697d87e3bda95a7d0eed06eda213e0fd5f09c9a76f1e013fdf01de2f78295ac99e124fa579433e6c101c6790cb3e6258b360850ec44cd7a
+DIST chromium-bin-101.0.4951.54-1-l10n.tar.xz 4898160 BLAKE2B bb6d0b9e09c02d26e759b16459505abb225dea423e955c1b0ec9058fed748fc0b075b20230996faebec09cfb33216c949aacf8db7ee7c0ebb5ca3e73f483354a SHA512 fffde66d9c6db24a0e6646024fee5657e6b2b205334b7109b13aeb40465779b374db8066faedf21a2d23dfb71d3a0420759191b15a2a61dda9cb1c0a7c63258c
+DIST chromium-bin-101.0.4951.54-1-wayland-aarch64.tar.xz 80096200 BLAKE2B f90c4040ad823540dbc584800ac34695bb27a72614937e61f7f907736adf5c9b1cb3b99898575572b1ad08eee4fedf8b4b394d2b59ccf380cfa774ec76792c1a SHA512 c0654d4de363dff6d418566a8bae533dd6a67ff6a6bf5fe3cf84ac97fc8361bb86ce24ad0b023d07f560a221909dbf38673bb182d52a48511a12b9db34596988
+DIST chromium-bin-101.0.4951.54-1-wayland-i686.tar.xz 84513784 BLAKE2B e1d69c4919f834456d7e54397c9aa936fff1da50ad5deb03f68c39be2a4b2e3da98c7613376e3c89a0d10010533d02fcf3806658a222718f444dc6ff1072e84d SHA512 7f0b5b9e4242fa73080f11657493fff9f96928775f8762497227fc5c270b5fb603a9f1dea9bb9f882cf6df3a6c17508dd8518deae18eb72158500a36d545978f
+DIST chromium-bin-101.0.4951.54-1-wayland-x86_64.tar.xz 83047932 BLAKE2B f1de6c432f06294d0b9a93d159b7f3960d32be7b707056a5b78900237cf2ab0b7c63216b41e2f1ac3634728425316c661dbf6591656541da7b0e2c84f5aa30d4 SHA512 dc6cb862c67aef8bf21767274769b75e1ba1f202ec09b23b9d509ef27ee30c4b09df6c5d00cf0c39a60621a3ae42baed697b33d8a010839742f222b4a5d51586
+DIST chromium-bin-101.0.4951.54-1-x11-aarch64.tar.xz 79904616 BLAKE2B 6c13ce48f9bddb429e9d0cb1c2240571286e022d1c0603277de564fda4deb79114cde66d8908a2867d31996902931621eda3f8a55a60ae1f1124116257de49aa SHA512 67c997d112b70562ad3fd1072b9d49f5b58a0561c5d711468e8469e0300b19517e30c052a5cc00ca330835a21b050938c8d702ffd4bb243bc4b76342fdcc9aee
+DIST chromium-bin-101.0.4951.54-1-x11-i686.tar.xz 84312512 BLAKE2B 868b750e8264ecf5f622e72cfda531acfe518257a70d56f0f2b44af4702b320497452d85881fd0f49857f783996193814ca00d20bfc386ebb53d6024c12270e1 SHA512 0fd52dc485605032850f7013b65c4c99f6e9d26a166f0efb4795be6730eeaa97440bbb421a6f91fe96a24dfc07f4b552bfa6cb1858628fe9095689724276d382
+DIST chromium-bin-101.0.4951.54-1-x11-x86_64.tar.xz 82834680 BLAKE2B 306e0d52887d740d0586e90457f256349dc6dbace4bf514e769d14b74a3be08f53071f1819ce5d2afa16a233eb679fef19c8940d387b0ef3a686e331ee739791 SHA512 238ef8726cf567ddb95609788e644ab18aa268611394a3945fdf31d14508f98f7211eadb7d0f6953213c85250866b0bf3f3517254b33ebc71f76cbd16e7f9256
+EBUILD chromium-bin-101.0.4951.54.ebuild 7336 BLAKE2B 6efd886be0aed414872dcbdb3dd42c8d735776a5ccf67fc60f25ca9bfcad6482363f70e54ad40513cc5c47a341e51514e1ccbbcbf1ae5ef05581536451a2bd73 SHA512 7a695e0ac724838b9718289830b0f528393933525a546f82b82cf66a578b505a0105af360adc5eedcf8c558643fa410f4277e244cf5ad0aff89015e353ca84b5
 MISC metadata.xml 552 BLAKE2B bd25b54be089682d19413c7aaccc11b8b7da6be5ab6d8ebc6585b6c80766b66aaa68365fe065a44979e5e408c1c11e210b2a3d8d378b93b65d4292066360145a SHA512 4286ebedb87808c0ad3ade5dac8e9bbfbec0a5696460274361f4d9ce46191719d00871e2a040055da4f5592b041249168bcce038e8a6f0301439364a397c3ac6
diff --git a/www-client/chromium-bin/chromium-bin-100.0.4896.127.ebuild b/www-client/chromium-bin/chromium-bin-101.0.4951.54.ebuild
similarity index 100%
rename from www-client/chromium-bin/chromium-bin-100.0.4896.127.ebuild
rename to www-client/chromium-bin/chromium-bin-101.0.4951.54.ebuild
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 6336fa7da90d..689dea295238 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -13,12 +13,13 @@ DIST chromium-100-patchset-4.tar.xz 5676 BLAKE2B aaa96413cc44ea75d2664b7d85130ca
 DIST chromium-100-patchset-ppc64le-1.tar.xz 46796 BLAKE2B 6fb35077abe7d2b0776be916be2123c3153c72993189e2d7230f248003a3cfdb518a178a3ee9add3fee2cbdaf09709cbe7b60aeead9fb6c6b97d67e2c84f212e SHA512 a009131baa937b190fbac59d45f71c87cab390cdc11302337055613a1f077a7a9bb2083686205efbcb8f3c686742bd2d2371c94f0352269f05a86c56d2026704
 DIST chromium-100.0.4896.127.tar.xz 1358426108 BLAKE2B 6a87cbc23dc55d97d948dddd092d2e9a0ce4739b68be8218ef3a4fe24dafbbe99af3e0e53a1faa64db67b8b001b8e13046afc41b8489d67e7a5350ae97ff2677 SHA512 2d5336470fead874aa1ca599cd7dbad21bd2a73c0b2136badd7a865799a96bf52938aca88c643c8b7e93ec6ceb897b7c4f71ae92b4210cdce0af828d17ea081b
 DIST chromium-101-patchset-4.tar.xz 3644 BLAKE2B 537be42d078338afc46fb8f358afecffdeea11ffc76d391a2c8785cee343bcde5de4d3c2a4102e2cd90a7331bf561c54b7e0c390e21785db3821d3cd39fcb080 SHA512 19370a96f1f3edcf4d529038dedfdc1bc680e6265832bf5b3d0a86f6dbc6784d34dd861ad39c328d4755e21966d19614cbd2f7719af2981abe2c7d8e0e985a78
-DIST chromium-101.0.4951.34.tar.xz 1414946732 BLAKE2B 05c2e8bb0c4183f08586c17367bdfc14345db5585b9418c99461192342bbc81525bb5e0ee25c38165485c050b16217d4f3678c003f4f283879a01ba5fbe97aef SHA512 d0aaa8508c4d9c947688de5c70f6bccfda6c1db21aed7860572a1a6f50fc0569296d2eb4046c92f05861f179aa23d743127db7ec69f1863e2ad5574f8dc943df
 DIST chromium-101.0.4951.54.tar.xz 1414896672 BLAKE2B 69829e87209bb7ff260a94113570eb60f586d52c696e4f057ee27312132d63cf0b6d36cd90d75ebca00622830d4bcc28edea3542efe44ea2d25ef4b8fc7e5986 SHA512 6c80afd5f9674e48d683a9fde91d3bc3fb6265e966a14ec8c5ec5dfea395924c08e872425f27b8da3a3ec46f4b765ef4546318a0bad23241e5f4a8671bdf95b3
-DIST chromium-102-patchset-3.tar.xz 4540 BLAKE2B 79daaafa620b8a2e3c0d5e04c43112d74ad5f5929753408a59f56098c13733a11c2c61b6ea303592916f78d1f3aef8ea6b32ef2fae8ce2c2ce2bb48c4781ea7f SHA512 c14499b775adc7fe3324dfbbad7322b7959d08d1d04b5e6d7a83f43f94b30e2e547c0635580356106e7c71ba9909a8759f8bd26f436f0599fb2cba99f568ebae
-DIST chromium-102.0.4997.0.tar.xz 1430480956 BLAKE2B a3ee13627cae99c41f3cd5a45610b1c766c2ce0d15aa7c717d297f51923c0bc7ed5c95f424eb51c3448336aa57e89cd7bc68325d17285a6972ac21ab1563af27 SHA512 59eec03408a7d8154e1988f6941101b7065bcb2c4c17568b00d2344a930aa909822b9bdef4a6b5476d3a909300521236402fe0e508be851237fc5bbc65acaeab
+DIST chromium-102-patchset-5.tar.xz 3840 BLAKE2B 2b86e683dd7915adecb1411c5013e3767446a73bedf2dd9ae6103dae64a1ae3bfdde7d2eb938a5066f40f69ecf286bd5169158431e5f281da96a51162fc42fad SHA512 388cd6257f48c14ad18ae8ead971ce6465f5bb2317f8421c1015d1f2be3c954aaf7306b568b828e45f351fa21e8328c604e5f2368aa9e4f2b12a7f8cce16720e
+DIST chromium-102.0.5005.40.tar.xz 1433244076 BLAKE2B d010d36400f93d341d99ca8c2f753b18147ef612c9800a2e74c683941af759f4ec2d5e03cb7ee910ffab5b9057434fce10bf78c27447b2dfae035c1cf0a907d4 SHA512 59cc8942a26e831e5277e197b5aabae06ef253de5f087c3e2d2f0eaf3a3f9adad49d882c6359d866772936b78115fb98d9ed1ae5ff0fd09611f3b52766a3f1f7
+DIST chromium-103-patchset-2.tar.xz 4120 BLAKE2B 19150d3fa0db43d9df7a30a9923cd95dc6ee49a38a148ecb7a3d73db077dac1f14348630a608d3ae35e89e6a44019d8e2dc86e45d1ad9fbbca9dfbd0437b4e47 SHA512 323f3dc6caa9b9e126b08330e390e059433dbee2a50892bf70f39cd0ac3f04f4d05d332629e53a626c39a0c30d47fadea84d305928ed45ab056773751cfe7c24
+DIST chromium-103.0.5042.0.tar.xz 1440576688 BLAKE2B 0aca834d50053f62077c683723c5ec2bde35d963f083281b7c611034cdb28c60ab08c97e079795d43ecc62c04f0c7447b1114c7184cd8b48dd1c833552ef833d SHA512 4f979bb71abc657514cfdb195316994b45c1290b71e325db7ccdb74aadcfed0499605f29da2c19a1ea445059e54a8be183174537375d7444ca4d77a74fe5ffff
 EBUILD chromium-100.0.4896.127.ebuild 32990 BLAKE2B 88d723fa58877275988c5eaa45e455d75dc124bd2dfab58032c6201572eb724245266b9cacd7228dc23ae180f43fe3d3d9d51f1513fcc9c8c473b82f9640e978 SHA512 4152c64430c92a1aa493558f8259bee5e52403690ba70327ec5ab870b696eaeb669c276d4b82a750791ef2d4c376064f8f24db0fe31b02b0a5004284203e17dd
-EBUILD chromium-101.0.4951.34.ebuild 32319 BLAKE2B 81ba03b301b6a3b5e90c6b7cc71c004e531ae64f7fe376a945591ab8dbcc3e10595b8c0cff83fd7f4935f573ea2c7b66cbdcafd4ebc5e1561e742045d829d2fd SHA512 f79470b8e6ae4924740d3c0a9edcc7a8e851fff5352ac8983250e3944e0f705817adc424ba61c8dbe67aa5a53548df8c720a2b997c2249579555d9dd1c9ce290
-EBUILD chromium-101.0.4951.54.ebuild 32321 BLAKE2B f63946389b4dbe64bfebd711706bf3b3abe985bf8ae1da41331912ab67f48e9fc6d4cf2bb597d6b7f9e2e040f2ef7eb8f5d6e4bc4dce0e9c60451d2e8eaaafa9 SHA512 c226e6ac2c591c661e96b01ed4b4920f63db9a8e5d0118435c96d041c572b3b9810b099c071022e8ecf8746f18741c5c8d362bae67c863ece2ded43e60e6d075
-EBUILD chromium-102.0.4997.0.ebuild 32558 BLAKE2B ed5586ad393cb934c79c6e4b260fbb32be2b532f2a234f7ff3c9bd2fc484339a54ecf728848a250905a8e0f56f4de06f32f87733cfea23fad2878098909c9b6c SHA512 5401dcabca19059cf1d32247ecd17addc2bebc360bf4607f04af96a9fa38521c9fad7bd02bb7827d6eaa0f8dab174a7ce022f11ee2c6841d5e1059b3f2f6a111
+EBUILD chromium-101.0.4951.54.ebuild 32794 BLAKE2B 8c53d985ee54a248f1bcdaa472e1bf50698facd859dc12db9d4de4cae9e458f0fd197488d72c327988865564fc4e9655e22f21e903408d5283f219e2c717c45f SHA512 8161017a1f3826d43388c1b7404b179feafbcdff8c1d286916ae046cacb697266e98cc08bdec86bb2dc3ada6c7985a48876562e403df8abe71d22e303dc85663
+EBUILD chromium-102.0.5005.40.ebuild 33045 BLAKE2B b50ddb2d2f55d44dc0e2294675aebff18b68412e451473a38b5cafa9841c676dbedbe77bd80146546315f8684e5f2410dea5a2ab3ec53e70ab6d6e89d812e1af SHA512 172ab6e10cf00188e75bfe8b7b99e24232592166d4256e3dfade5b353b8a473210f7004c80749d916e8b079eb7f7d49ebee75fef318037bb3293e3364a49884d
+EBUILD chromium-103.0.5042.0.ebuild 33424 BLAKE2B 23e7bc6a212d502fdbbeabf3c39d517096e65d84d0922159e3a5d63167ea9e36cf3c484ff3d08cf25062051c180be30e3625e2afe5ad14991a068372db86ee7d SHA512 51eba12740520660b9c5b0ddb28fbf36789aeff3994be48db3c796da74f5c44a48da4dfeaf6a502dce4e64e642566498bea81b3f9b6731ebf357df36a7a72834
 MISC metadata.xml 1989 BLAKE2B 7f7abe672f3bc996359e47b73a26cb77d8be0171ce8f46a59cfb460a9a333e94647b8c491e96767c04134138e0989b0700235b621c0c76783d1a0d97dbd61624 SHA512 80ca8b1c394854fe6e1b8291dd36c5210958ef8934a8c0e50cbb4e7e95c533613b66a3b34d9d937542b78e33750c5c81a284623a478809d924272a90e9051dcb
diff --git a/www-client/chromium/chromium-101.0.4951.54.ebuild b/www-client/chromium/chromium-101.0.4951.54.ebuild
index ef2b38403ea3..f9008a0c83e7 100644
--- a/www-client/chromium/chromium-101.0.4951.54.ebuild
+++ b/www-client/chromium/chromium-101.0.4951.54.ebuild
@@ -529,6 +529,11 @@ src_prepare() {
 			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.
@@ -756,6 +761,14 @@ src_configure() {
 	# 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
diff --git a/www-client/chromium/chromium-102.0.4997.0.ebuild b/www-client/chromium/chromium-102.0.5005.40.ebuild
similarity index 98%
rename from www-client/chromium/chromium-102.0.4997.0.ebuild
rename to www-client/chromium/chromium-102.0.5005.40.ebuild
index 3a02ebb0cc5b..492e421fd1d0 100644
--- a/www-client/chromium/chromium-102.0.4997.0.ebuild
+++ b/www-client/chromium/chromium-102.0.5005.40.ebuild
@@ -13,13 +13,13 @@ inherit check-reqs chromium-2 desktop flag-o-matic ninja-utils pax-utils python-
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="https://chromium.org/"
-PATCHSET="3"
+PATCHSET="5"
 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"
 
 LICENSE="BSD"
-SLOT="0/dev"
+SLOT="0/beta"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx +official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine"
 REQUIRED_USE="
@@ -132,6 +132,7 @@ BDEPEND="
 	>=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
@@ -532,6 +533,11 @@ src_prepare() {
 			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.
@@ -759,6 +765,14 @@ src_configure() {
 	# 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
diff --git a/www-client/chromium/chromium-101.0.4951.34.ebuild b/www-client/chromium/chromium-103.0.5042.0.ebuild
similarity index 91%
rename from www-client/chromium/chromium-101.0.4951.34.ebuild
rename to www-client/chromium/chromium-103.0.5042.0.ebuild
index 8077469a961f..61964aa1dc04 100644
--- a/www-client/chromium/chromium-101.0.4951.34.ebuild
+++ b/www-client/chromium/chromium-103.0.5042.0.ebuild
@@ -13,22 +13,22 @@ inherit check-reqs chromium-2 desktop flag-o-matic ninja-utils pax-utils python-
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="https://chromium.org/"
-PATCHSET="4"
+PATCHSET="2"
 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"
 
 LICENSE="BSD"
-SLOT="0/beta"
+SLOT="0/dev"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx +official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine"
+IUSE="+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx +official 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 ) )
 "
 
 COMMON_X_DEPEND="
-	x11-libs/gdk-pixbuf:2
 	x11-libs/libXcomposite:=
 	x11-libs/libXcursor:=
 	x11-libs/libXdamage:=
@@ -38,11 +38,10 @@ COMMON_X_DEPEND="
 	x11-libs/libXrender:=
 	x11-libs/libXtst:=
 	x11-libs/libxshmfence:=
-	virtual/opengl
 "
 
 COMMON_SNAPSHOT_DEPEND="
-	system-icu? ( >=dev-libs/icu-69.1:= )
+	system-icu? ( >=dev-libs/icu-71.1:= )
 	>=dev-libs/libxml2-2.9.4-r3:=[icu]
 	dev-libs/nspr:=
 	>=dev-libs/nss-3.26:=
@@ -64,10 +63,12 @@ COMMON_SNAPSHOT_DEPEND="
 		pulseaudio? ( media-sound/pulseaudio:= )
 		sys-apps/pciutils:=
 		kerberos? ( virtual/krb5 )
-		vaapi? ( >=x11-libs/libva-2.7:=[X] )
-		x11-libs/libX11:=
-		x11-libs/libXext:=
-		x11-libs/libxcb:=
+		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:=
@@ -93,31 +94,33 @@ COMMON_DEPEND="
 	media-libs/flac:=
 	sys-libs/zlib:=[minizip]
 	!headless? (
-		${COMMON_X_DEPEND}
+		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-libs/gtk+:3[X?,wayland?]
+			gui-libs/gtk:4[X?,wayland?]
 		)
+		x11-misc/xdg-utils
 	)
-	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?] )
+		gtk4? ( gui-libs/gtk:4[X?,wayland?] )
+		!gtk4? ( x11-libs/gtk+:3[X?,wayland?] )
 	)
 "
 BDEPEND="
@@ -132,6 +135,7 @@ BDEPEND="
 	>=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
@@ -243,10 +247,8 @@ src_prepare() {
 	local PATCHES=(
 		"${WORKDIR}/patches"
 		"${FILESDIR}/chromium-93-InkDropHost-crash.patch"
-		"${FILESDIR}/chromium-97-arm-tflite-cast.patch"
 		"${FILESDIR}/chromium-98-EnumTable-crash.patch"
 		"${FILESDIR}/chromium-98-gtk4-build.patch"
-		"${FILESDIR}/chromium-101-libxml-unbundle.patch"
 		"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
 		"${FILESDIR}/chromium-shim_headers.patch"
 		"${FILESDIR}/chromium-cross-compile.patch"
@@ -257,6 +259,11 @@ src_prepare() {
 	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
 
+	# only required to fulfill gn dependencies
+	touch third_party/blink/tools/merge_web_test_results.pydeps || die
+	mkdir -p third_party/blink/tools/blinkpy/web_tests || die
+	touch third_party/blink/tools/blinkpy/web_tests/merge_results.pydeps || die
+
 	# adjust python interpreter version
 	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
 
@@ -312,6 +319,7 @@ src_prepare() {
 		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
@@ -319,8 +327,8 @@ src_prepare() {
 		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/dawn/third_party/tint
 		third_party/depot_tools
 		third_party/devscripts
 		third_party/devtools-frontend
@@ -348,8 +356,10 @@ src_prepare() {
 		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
@@ -367,7 +377,6 @@ src_prepare() {
 		third_party/jstemplate
 		third_party/khronos
 		third_party/leveldatabase
-		third_party/libXNVCtrl
 		third_party/libaddressinput
 		third_party/libaom
 		third_party/libaom/source/libaom/third_party/fastfeat
@@ -409,7 +418,6 @@ src_prepare() {
 		third_party/node
 		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
 		third_party/one_euro_filter
-		third_party/opencv
 		third_party/openscreen
 		third_party/openscreen/src/third_party/mozilla
 		third_party/openscreen/src/third_party/tinycbor/src/src
@@ -433,6 +441,7 @@ src_prepare() {
 		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
@@ -454,6 +463,7 @@ src_prepare() {
 		third_party/swiftshader/third_party/marl
 		third_party/swiftshader/third_party/subzero
 		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
+		third_party/swiftshader/third_party/SPIRV-Tools
 		third_party/tensorflow-text
 		third_party/tflite
 		third_party/tflite/src/third_party/eigen3
@@ -462,7 +472,6 @@ src_prepare() {
 		third_party/six
 		third_party/ukey2
 		third_party/unrar
-		third_party/usrsctp
 		third_party/utf
 		third_party/vulkan
 		third_party/web-animations-js
@@ -481,6 +490,7 @@ src_prepare() {
 		third_party/wuffs
 		third_party/x11proto
 		third_party/xcbproto
+		third_party/xnnpack
 		third_party/zxcvbn-cpp
 		third_party/zlib/google
 		url/third_party/mozilla
@@ -529,6 +539,11 @@ src_prepare() {
 			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.
@@ -756,6 +771,14 @@ src_configure() {
 	# 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
@@ -789,6 +812,17 @@ src_configure() {
 		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"
@@ -797,25 +831,21 @@ src_configure() {
 	# Enable ozone wayland and/or headless support
 	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
 	myconf_gn+=" ozone_platform_headless=true"
-	myconf_gn+=" ozone_platform_x11=$(usex headless false true)"
-	if use wayland || use headless; then
-		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+=" ozone_platform_wayland=true"
-			myconf_gn+=" use_system_libdrm=true"
-			myconf_gn+=" use_system_minigbm=true"
-			myconf_gn+=" use_xkbcommon=true"
-			myconf_gn+=" ozone_platform=\"wayland\""
-		fi
+	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+=" ozone_platform=\"x11\""
+		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
 
 	# Enable official builds
@@ -906,7 +936,7 @@ src_install() {
 	doexe out/Release/chrome_crashpad_handler
 
 	ozone_auto_session () {
-		use wayland && ! use headless && echo true || echo false
+		use X && use wayland && ! use headless && echo true || echo false
 	}
 	local sedargs=( -e
 			"s:/usr/lib/:/usr/$(get_libdir)/:g;
diff --git a/www-client/microsoft-edge-dev/Manifest b/www-client/microsoft-edge-dev/Manifest
index cb6ad1555937..b936aee46848 100644
--- a/www-client/microsoft-edge-dev/Manifest
+++ b/www-client/microsoft-edge-dev/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-dev_102.0.1224.0-1_amd64.deb 119968952 BLAKE2B e21b1db3b05a4b2d18458e5e79a0348a23b4e50b11afa11dfff7859074ae3f7b4587f1a9ed363144669be7e42e7d883e9d160a6e9ab4ec7df0ea1216c684bc4b SHA512 f26e1e2ef079a022096871e65db149361152e9481cc5c4e6a0657ee0f547ec34ce14115e247f7566076587447a1dfdfdd8759bf085486498d27005b373bc3a83
 DIST microsoft-edge-dev_102.0.1227.0-1_amd64.deb 120036328 BLAKE2B 786ad517b1d54215afb7ba5713f81f54a8509c0ce749cec6d7cc226e9dfd3117c88b75c5632ea0ab1efab421cf68bcc44170066a8d5da00d39e0b7bb8a9ab3d8 SHA512 9ce820593738d751632aa49be2aec78764beb1bcd5c168016a2b35eb5740248bc1bcd3b25c333afea7f783fb18d1fa9feb284b0b5086b86fa3550114238b4325
 DIST microsoft-edge-dev_102.0.1235.1-1_amd64.deb 120115308 BLAKE2B 490f4c6bed45a6f279febaf809eba13746dabaf73b398485b7a58249ad9c1dbd1f1f6e5e28a9dcae6bfb7bde52a3279cf065f95134c9c4208897a9eb3a816fd4 SHA512 e35aaf186510cdc0e3abe3e21dc9cd77e1e7a35d87e4db8549ae68efbab0b4bab876b62a33d49b0af9b305a85e69057a5866bb8473690cd32d0b36f9b38dcd1d
-EBUILD microsoft-edge-dev-102.0.1224.0.ebuild 2504 BLAKE2B 7814aa517dea7ae2621aaa7a78ed8382b1df55b42089441547d17c37c7eb9d0bb0a1db6cc427ace91f2a08e340c5667893604841fb59952806f916442df0ee97 SHA512 928fd020e419bde93a3fb8493e02d4c73db393913dd9189cf08bba8071c7a8f097e7150a9aedd741d8341dff44a8e8501c3c9be6bf6b8613c18f4ac1e3425ade
+DIST microsoft-edge-dev_102.0.1245.3-1_amd64.deb 119504976 BLAKE2B 193d2b14a464e084ee071844b9c97c3e8bae03afadbc9ab1d7a8d327b11054b3d651a2ff0588f3a322f441396482d1c2a9c756e5cde9a0e63bacaf42525b8bb0 SHA512 df4783fc77bd52d8d03e5e7f37ddda9a4928e657f55d1a22a0941650c1d6fa18ee7274601063abfe7026288c2d21d4347d6004682a47044c6e964384adf284cd
 EBUILD microsoft-edge-dev-102.0.1227.0.ebuild 2504 BLAKE2B 7814aa517dea7ae2621aaa7a78ed8382b1df55b42089441547d17c37c7eb9d0bb0a1db6cc427ace91f2a08e340c5667893604841fb59952806f916442df0ee97 SHA512 928fd020e419bde93a3fb8493e02d4c73db393913dd9189cf08bba8071c7a8f097e7150a9aedd741d8341dff44a8e8501c3c9be6bf6b8613c18f4ac1e3425ade
 EBUILD microsoft-edge-dev-102.0.1235.1.ebuild 2504 BLAKE2B 7814aa517dea7ae2621aaa7a78ed8382b1df55b42089441547d17c37c7eb9d0bb0a1db6cc427ace91f2a08e340c5667893604841fb59952806f916442df0ee97 SHA512 928fd020e419bde93a3fb8493e02d4c73db393913dd9189cf08bba8071c7a8f097e7150a9aedd741d8341dff44a8e8501c3c9be6bf6b8613c18f4ac1e3425ade
+EBUILD microsoft-edge-dev-102.0.1245.3.ebuild 2504 BLAKE2B 7814aa517dea7ae2621aaa7a78ed8382b1df55b42089441547d17c37c7eb9d0bb0a1db6cc427ace91f2a08e340c5667893604841fb59952806f916442df0ee97 SHA512 928fd020e419bde93a3fb8493e02d4c73db393913dd9189cf08bba8071c7a8f097e7150a9aedd741d8341dff44a8e8501c3c9be6bf6b8613c18f4ac1e3425ade
 MISC metadata.xml 528 BLAKE2B ef09f12e6f9b503cd78a39ece67ab0b21c4760114b052bf105b7c5e426a1df43a5b37ff547338fc7122ac8a029b2ebb85a8793dbd4d192ae990ae71829dcdec6 SHA512 b6ab632cfce365f249a178a261eba3d469cd645cdcb99dd1bc4f1e865fbd6668cfd0f7171843e2b234ff852f8191a8b08b48cf89991cdfc7ca36337a71e5a38d
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-102.0.1224.0.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-102.0.1245.3.ebuild
similarity index 100%
rename from www-client/microsoft-edge-dev/microsoft-edge-dev-102.0.1224.0.ebuild
rename to www-client/microsoft-edge-dev/microsoft-edge-dev-102.0.1245.3.ebuild
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index a39c1ad62b49..7db2fd22ef5d 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 7e12322d21c9..02a02edcb6e8 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -5,6 +5,6 @@ AUX cairo-1.16.0-pdf-add-missing-flush.patch 914 BLAKE2B 6277dccf5e6fc70d885548b
 AUX cairo-1.16.0-strings.patch 1379 BLAKE2B 60b63e80ae35385a0c2cbbface46379e76ad8cbc472d76fd68803330e42c49f9c71d662b1824ebf16fbd1bde794ec12a34b8e311758d6e639411e35cd1f34f97 SHA512 d9d9e95b80a0aaee703ff4f58526455db5ac57bce35237826ef4730c54f58b6752756ab92f23e36343e056b0e84269c4b692dfc40cc7836afad3b44fc46c2e26
 AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0fd4981a07a25122387c2f1b6ca4cd89a830360357953706dee62e4233126cd0630e4622f0682f6782cd27fa31f20ecc SHA512 4d4d473f956b56f11b31f513de06751dcc77342e0f04ecf37064a74b8217f9d3536c0a8a41b09e580f34576ff2d06815b4cbc2bc091c201f947965509677415e
 DIST cairo-1.16.0.tar.xz 41997432 BLAKE2B aa37edf7fdf0c952484fd0adc9281724227db93958d6e4919216b30e9017fab670bc2340e3b975737080f1f67dec24025fe0e4680e275ab7703cfb9235eb1fe0 SHA512 9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f
-EBUILD cairo-1.16.0-r5.ebuild 3873 BLAKE2B b3678e94ccef9af83c353e6f2cb3f1f02260277a8ddf5bad33f086ed4675d5aa5ae43dc177c12879469392258fedcf0f2303287cfed590a8e10243d04f129cc9 SHA512 12f69610664fe3e6bfc6ce96c2a80961667c752e3703f91656d27226eeefe706b93455993804b07d44fc299d7915f6918ee986d60942675b245a6d979f4ab31b
-EBUILD cairo-9999.ebuild 3501 BLAKE2B 136a331173d878461a0e827dc74bf42e24fa8d2dc9e907a3c76cc1e12f3ca3f06dddcd4dd7f2fba418a219dfd96c1c696a983ea9f5306e15be72edac35aaf180 SHA512 929ec8991c487415aa7f18760f86276a7b128e44eb8396c48a0018c8c24d49402ca8d56a07b26aa27b4db6b0e9bed8700a310e46c6007ed389a800983335268e
+EBUILD cairo-1.16.0-r5.ebuild 3880 BLAKE2B 6ad87c765eedbbc340b1cfd9140ba615917b9d297a18eedb2448189ee2b02a3a682b0c2bccdfc6a1b544f1bb76032deffd55363eb966d64cd056b390ed101411 SHA512 8b8f20ae15c27f7ccc00c8a77b3c75039472aaef7d063076478d98432efc35f2c151b4eb1c78a3109f1aa256158f485031fb5e3e4c101e5f6f48a6ea5fb17bda
+EBUILD cairo-9999.ebuild 3508 BLAKE2B b858786e987dfb89fb18a61222d50123d1975ce3eb9e3a324b149b771038ce8d6766bf0107e24cedabef053a812c155f3f938f5eb63ce7e7004904e71339fe5f SHA512 0d6a8991cf66279fc4e894781ba2b0cff145d56ef8ee94f952d736f0eea3751e8dfc396b3e2dcd578350191aa7d31a2c795c9da71027e9f767ff7209f284c82e
 MISC metadata.xml 710 BLAKE2B 11585ec0ac0ad56eb192f84388ab9fb7ce751ae29555fb366cd8966ec38fceace4978a2b6cad310073484eae51539dcbbe68323205b2b8e97217bc1b87f62b48 SHA512 1021784a9a6db6290fa57e2e5ed356131860820a114a601c8e77fab77eb7b075b81f1288e5df97cad8fe2d86b7aeb67a712f8fd9c5ed775d607d50d6a589dc01
diff --git a/x11-libs/cairo/cairo-1.16.0-r5.ebuild b/x11-libs/cairo/cairo-1.16.0-r5.ebuild
index a1546a49797f..bf5a7256fd4b 100644
--- a/x11-libs/cairo/cairo-1.16.0-r5.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r5.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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"
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 0c5c1384ad56..1ee8a6752f0d 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index 06ddb45f154e..c984edabf0c0 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,4 +1,4 @@
 DIST pixman-0.40.0.tar.xz 634752 BLAKE2B 29b71f5eb6c3df0318c7a6153c6abbce29748b0b578697916414a869a029635fe5e0bab06b8f701a764c95e475c115ed12eb4f93c751d234b5868f4c4196d7db SHA512 8a60edb113d68791b41bd90b761ff7b3934260cb3dada3234c9351416f61394e4157353bc4d61b8f6c2c619de470f6feefffb4935bfcf79d291ece6285de7270
-EBUILD pixman-0.40.0.ebuild 1851 BLAKE2B 40f21271b618365fa23f17272896597b0a5ba6bb249e1aa72244b1079a1e5cceb200e51d974ca1a65cc6e6add176f2631823214f59f2890b37b8d37d6a9b57cc SHA512 bd3ff7029cb8fa8bf202eb9967b75c2b9b27c4dd3504420f066756b7cd02c7048ff4b73339bf7cbe0f688249aac136c056bcafc4973f0c0d93a2ff24b0fd15d5
-EBUILD pixman-9999.ebuild 1859 BLAKE2B ccc5b9b92936bd435c60e99f5ce1b2bdc5231fc522b5c4f4a998b2da259ba45edc1ce749646c71d07c702b26d33680ceb5a2f0aa90e7699856f42a7afbc2a76e SHA512 f14a343095a5312c67423b89387942b27581263f114d5a091553e2f0e13f52b55233b833ecad9438435aa2026679e566d44263cc13dd4c5f6cf9fd6ba6d013f5
+EBUILD pixman-0.40.0.ebuild 1858 BLAKE2B 06deeef64acab12ae0d51852c79a530c5e156ea33c2705095d76ddb1912b4a9c1f4946d36e551ebf1e731b766a5c497b4ded567bdb2695bca1ac35baf535dcc0 SHA512 6efcfa79a27ceb5454f24629b1bc309a6fe1da1de282eeee9fdf6df8342202fdcb0d0c0d1715627a97b5971b3b9125a498ba9ab3200efde3565a72dd51b38e14
+EBUILD pixman-9999.ebuild 1866 BLAKE2B b1a8cb848989ef3e5b5d298a441d805a1e7c7f1e3762f777a2ea29c9f3a9b4d868a55b640583aa25b9d228621db45a26e7c213a2d4cc250b2d856ff599093766 SHA512 d9d094a709813add61b94eadda8a2cf64bf1fb7476ac85d5900c855c82f45e3afa1ab216b04e37fd14d44d80736e876226fcf6abd8e7d5eca5b41436baf0a2fe
 MISC metadata.xml 392 BLAKE2B 5ad5ba991fefef08fe1fa364ce726a90a338c6840947cd6fb9ac57b7e4cdff0389d9a6fac955164529a51ee5ec92cd2e478e4d330484593fcfdfc8d5325ca21b SHA512 ae68e9a2a492e899bff3ea5c70c88f054fde927c18e9d4a3c08030c8b2f5b6f2977bf9590b4d4776bb1151a3cd9de72bc18460c0ebdc2f506c8ff51b99a5b3c5
diff --git a/x11-libs/pixman/pixman-0.40.0.ebuild b/x11-libs/pixman/pixman-0.40.0.ebuild
index a269bcee7084..d74622ede459 100644
--- a/x11-libs/pixman/pixman-0.40.0.ebuild
+++ b/x11-libs/pixman/pixman-0.40.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
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	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 ~x86-winnt"
+	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 ~x86-winnt"
 	SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz"
 fi
 
diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild
index e6332d538639..b1bf1b2339dd 100644
--- a/x11-libs/pixman/pixman-9999.ebuild
+++ b/x11-libs/pixman/pixman-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	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 ~x86-winnt"
+	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 ~x86-winnt"
 	SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz"
 fi
 
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 364a129ea4a8..0bd8a29d8c5c 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 1686677fcf46..b648fd6f361d 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -2,6 +2,8 @@ AUX mutter-40.0-Disable-anonymous-file-test.patch 862 BLAKE2B bb7a0f0dfa5f0543c9
 AUX mutter-42.0-Disable-anonymous-file-test.patch 765 BLAKE2B 7d223e0dc98963b61cb0bc26ec22775e87942f88f97af7dbcde63e0d960f5b41afc3de0b358b0c6252de90af4451d4fd6c75b7815ab573c7199b0c82cdd1eb7d SHA512 c066d1b5541078c6cc8d2788b36935b9aff0f1fbb800f39fa4674755a6842be66736c57b43d5edb00e5c18a33c1ff17d54a546134e5aae8ebd9a8967cd46b164
 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
 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 5377 BLAKE2B bdd67a1ac3dfa4f2494c78848138cc10043add8e5fec79e3aa21c294475abb21660c7f672e73d6eb2de7e3cc70b0ddc9cd0a52b8281693b53514e689ede06197 SHA512 d83ec646bfbfdd02c5b462c40e9c8ed15b2f050cfd277445d38e5c9d921f34aca53f9ce5c6cd14e05a803b197532f8419fc4f0546caab06be18d555e79d0d25a
 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
new file mode 100644
index 000000000000..64c4d9748678
--- /dev/null
+++ b/x11-wm/mutter/mutter-42.1.ebuild
@@ -0,0 +1,184 @@
+# 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
+"
+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() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}