gentoo auto-resync : 18:08:2022 - 08:34:07

515 files changed, 3472 insertions, 10046 deletions

diff --git a/Manifest b/Manifest
index 0dbcdf39f100..64a5305149f8 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29631 BLAKE2B 694fb3780543b1f3f8ff5f6b886488fead63feba4a8660def5f41fb5a8bbe65a0825fe0c5c91de0ce90d622aafa99e921db1e072891717b28c32c3f02fb8efd3 SHA512 ed09d374fd47be485de488b414189878eb4d638ec31da4cec744dca3e181baa077c3831e17b609d1dfdae4cc3a6c2bd424cb4731a84c60beeb713ccc85a2d0ce
-TIMESTAMP 2022-08-18T00:39:49Z
+MANIFEST Manifest.files.gz 29620 BLAKE2B 4fbfcd6af34fa000061785e33162074c2b05bd0f2ae1d6c860da72baf219c83096e56bd701462f675f1f110413a62480d1d77c7012798b4b1edd64ac0112eba2 SHA512 badc6de8d96a1991567e90a523ec8c37f4dbc57e6bd91fc16fb319b5f451acd8124b45a71d10a2e8bac104613f623a881eb0d0caa09eaf847e8bcb13e2de59e2
+TIMESTAMP 2022-08-18T06:39:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL9ilVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL93rJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCtSg/9HxYsuA/zPXglZT3GY2W3kHR1sbcnXB0oK/O3NjfC8ErUXXvEVopsuBd2
-pY2eW5CsTeuSiQlmzJh4IivFbuDlh0OuNeh2iW4MYeof7WQ7L8WbUilj1uL1R6hP
-OW2v21hNS5ddWcFMAauKaay5+Bjg0UAxofuwoxeVGUtW9lFl75hgAcSfVXLy4pWA
-vK+2kvi6ulJXS5+fIgJuNBpI9nTQNIOLS2V5UxJ0pbchkMWJ9CCDGK2Q9wMmCBGe
-tIR8sB/Ed3RO7C4Vs9sw/hY8jBUe6u+wXMMLjgjQlmUWAuvNig2pyjZbUX8yXT7+
-it7GgGnuWuunQG2lrK0kt2ryGFF3gtlH3n0vv9yVw2g5pbWk7X6fLqUWR8022Gkd
-Cz/3VtrEdjhCM7uITEPtJn7m8kMsfMwMloiZRlpLsNiIwrmx2WsA/tdgmyG9suH2
-0HHEUqWBj1ytUftApAoZMtGeEtKr+BfWP/i9is17nptPNblvriuFiuQtAdQefjql
-4W6FUZpJCbOjm7BoL6AddvrfG8qfBfZGVFxuLM1Q3dJO0Rbdc87BYh3bpwMK0AAZ
-ttsKEduSPy0h02GMoHpXZqNNgcnI0ulo41EWuty+NM2Ex3TtjevI9MVaVvn6PvVo
-IDvJBgehPdyyDD1nel5cWBBJG5gX++pxyHP4R7q+ASd9K0LWvo0=
-=gFwn
+klAnXw/9Fgl/guaBwfZQ55GdjL8AEBp6qW5FeFGxk5HdTeEBkdbpkDR48PZTuqoA
+yxNQ5FE0DnobzffOMmGwOdtzaIQwdcD9XdcPkKdUnH2I/SqQO6wPLABiMLA0iz5u
+99T3fNp+F+qmRYHa/UjjtI0+9L+N4G1PwDAwl10WRro5d9BbQNDnl9v0yc8zb0Te
+F7hJNsXLZOmuFuBhJQup4T9WMup8+MQqbde6OOeeCj7906I6U0QWZ2/43mnN9PTM
+bd+QUjfzErd2LDgzGs0wL24Il/akXavFOWPiL+bMgEVB3IKvwwiPotUPLDLHMJza
+SMFMGJMA1IH7onlTF7NJALyYTIKlPnBcKy5Ysy24u6q7eqKgA3zuEyeNonNcMEzP
+jBGbe0Fz8CBZyrNPixjtvNX7Wo+ho8TZ8g0HtNCFniPhp9DmkQsgDH9RUCP0tXlN
+v4ihwwMOdQKYb5QtkOEz2EICxJlWJ9WxHc2wrTEe9hDgFZaWDMt8FnpKEj+jzDJr
+z4DW2xWG09bn5TlxVxyh2ZdoibtEIofKjSf/2AkQVfOb710arBV4wopvuBdkpKWK
+x07s9pFrRWlaJh8BApBHYDtAhTwBtZRXwMu4pJCKGQKryBq5keiUxopYkyVPVhVe
+eK7q1+HEDqRVFLtySuTfvIZHTZ3tpihVx5r9KMHyayG6uMkrHFo=
+=Acxg
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 8c894289bfc8..3b0141cb5dc8 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 274cfffa6887..8e5bfad5ce02 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/emacspeak/Manifest b/app-accessibility/emacspeak/Manifest
index b8f3ca6ea80e..3dd83b081743 100644
--- a/app-accessibility/emacspeak/Manifest
+++ b/app-accessibility/emacspeak/Manifest
@@ -1,4 +1,6 @@
 DIST emacspeak-39.0.tar.bz2 4989631 BLAKE2B ea58436fd3d7450938de04b74dcefdd9b9c5bee5c8c3bf48dbd2ca5bd5ce5c795a0d4c60ec05ca83c0020ca650b717e378717dc2d68eb56e80653b5045d5b132 SHA512 c0a0c503d6ccc2abb53a8be580997b44e0449c2225e8a64cee73c24d69a28c3f47c0e660a95a6e77dd4d660272ad562ff747ce3c0a989f8fe7c8171f60349173
+DIST emacspeak-56.0.tar.bz2 7158646 BLAKE2B 484b98e5fac51d30bd9b2705308042ed9e0a49a4684ca777cbc60368fdadd8206ef212af514a5940509c84fee3fdcad12486a31a47cac658c912d7573a484fb7 SHA512 9b18fada991b914ddd3ed30950e685c1c164434536c3dd119b9ed52db80e7e31b7399c72a584938bfb63daa7e1aa76a1f377d664cc1118ffa7f0a4cbdddf0818
 EBUILD emacspeak-39.0-r2.ebuild 2075 BLAKE2B 1adb4a4cade944dd77d4635f9db22face5b234e2c0d0b577902cd21e503c323c0fcbf93e254942cc7ccec3cad49adaf7b55b6f030d8b691b2887337ea9613381 SHA512 b1507eb711316486f4d026a40116d465e909c9709bae2fe4549369fc525d2dc55bd16621661296049174cb327e0e35fdc3d77511ba1edbb54b5f25a7d16da182
-EBUILD emacspeak-9999.ebuild 2078 BLAKE2B c5a3b3230f5e2ff9f321ba405aadf463f03d0a57657e4b96b00f1f0168f8a504f5689ae685ff81199a9b65ff178270b85d37470a26e1726fa68821542cbd57e9 SHA512 755477e57ed910b0142203839a2ab228eb6fd099b877024731b87fb62294d737dd79f4799a06104192209dd749342d189876ec58d18afb81281c38a7b3e619c9
-MISC metadata.xml 936 BLAKE2B 17dbe6b87657e6994fb3cfb424e7d2a053b86b704312841c92b8e8f0dac5b43f1155f2c1f96a562bd68872762b49b4dcd6ed9356c5d6c8c29746d20d62b0018d SHA512 4118b5a9d29358e3b6a2afeb8b6e5eb378adb41f95abf67514e41aa41d7973cc7f810622d2c63069020bd47e5e46b44a86d1b748d4888f6bd4842ceb29712f3d
+EBUILD emacspeak-56.0.ebuild 2277 BLAKE2B 9599cb85e0419b300c23555612982a1b738096933a1195ed69b6e6c5d483710385d07d4d3028a24e7d5852bf3d479d6057c49977e630352effeb65d06edfd124 SHA512 72ad1cbad82531a9c266fce82295fdb4fbdd0afac90175d880c65adbf8c94d76a5e5ec16fa1e1196e5a72484e873f717b78d6c9f0c3b245476218a40c0f7af64
+EBUILD emacspeak-9999.ebuild 2277 BLAKE2B 9599cb85e0419b300c23555612982a1b738096933a1195ed69b6e6c5d483710385d07d4d3028a24e7d5852bf3d479d6057c49977e630352effeb65d06edfd124 SHA512 72ad1cbad82531a9c266fce82295fdb4fbdd0afac90175d880c65adbf8c94d76a5e5ec16fa1e1196e5a72484e873f717b78d6c9f0c3b245476218a40c0f7af64
+MISC metadata.xml 993 BLAKE2B e69adb1f4b3764ccbc6f716e1917ac6d29fbb0d596edc5f2aae57fafbb3ef1eef105cadb35e0f52d18f842cfa657f994cf5d38970777186c3f29125e5f9b79e2 SHA512 31a4d84e9c8910506df082217fd27f3eeb6f038e7f14903179f6b67c24cff4a7d00542565b99e9047aca80b2a78c47666e7f3670db2b9635b6c2dfdc25147bba
diff --git a/app-accessibility/emacspeak/emacspeak-56.0.ebuild b/app-accessibility/emacspeak/emacspeak-56.0.ebuild
new file mode 100644
index 000000000000..e9ce5050771c
--- /dev/null
+++ b/app-accessibility/emacspeak/emacspeak-56.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+FORCE_PRINT_ELOG=1
+DISABLE_AUTOFORMATTING=1
+inherit elisp toolchain-funcs readme.gentoo-r1
+
+DESCRIPTION="The emacspeak audio desktop"
+HOMEPAGE="http://emacspeak.sourceforge.net/"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/tvraman/emacspeak.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/tvraman/emacspeak/releases/download/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+IUSE="+espeak"
+
+# Usually need := dep with tcl anyway but in particular, it's needed
+# here as we do a version check in src_compile and bake in the results.
+DEPEND="
+	dev-lang/tcl:=
+	espeak? ( app-accessibility/espeak-ng )
+"
+RDEPEND="
+	${DEPEND}
+	>=dev-tcltk/tclx-8.4
+"
+
+DOC_CONTENTS='
+As of version 39.0 and later, the /usr/bin/emacspeak
+shell script has been removed downstream in Gentoo.
+You should launch emacspeak by another method, for instance
+by adding the following to your ~/.emacs file:
+(load "/usr/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.el")
+'
+
+HTML_DOCS=( info/ )
+
+src_configure() {
+	MAKEOPTS+=" -j1"
+
+	tc-export CXX
+
+	emake config
+}
+
+src_compile() {
+	emake emacspeak
+	if use espeak; then
+		local tcl_version="$(echo 'puts $tcl_version;exit 0' |tclsh)"
+		if [[ -z ${tcl_version} ]]; then
+			die 'Unable to detect the installed version of dev-lang/tcl.'
+		fi
+
+		cd servers/native-espeak || die
+		emake TCL_VERSION="${tcl_version}"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if use espeak; then
+		pushd servers/native-espeak > /dev/null || die
+
+		emake DESTDIR="${D}" install
+		local orig_serverdir="/usr/share/emacs/site-lisp/emacspeak/servers/native-espeak"
+		local serverfile="${ED}${orig_serverdir}/tclespeak.so"
+
+		install -Dm755 "${serverfile}" \
+			"${ED}/usr/$(get_libdir)/emacspeak/tclespeak.so" || die
+		rm -f "${serverfile}" || die
+
+		dosym -r "/usr/$(get_libdir)/emacspeak/tclespeak.so" \
+			"${orig_serverdir}/tclespeak.so"
+		popd > /dev/null || die
+	fi
+
+	dodoc README etc/NEWS* etc/COPYRIGHT
+	einstalldocs
+
+	cd "${ED}"/usr/share/emacs/site-lisp/${PN} || die
+	rm -rf README etc/NEWS* etc/COPYRIGHT install-guide \
+		user-guide || die
+	readme.gentoo_create_doc
+}
diff --git a/app-accessibility/emacspeak/emacspeak-9999.ebuild b/app-accessibility/emacspeak/emacspeak-9999.ebuild
index 67a6062698b4..e9ce5050771c 100644
--- a/app-accessibility/emacspeak/emacspeak-9999.ebuild
+++ b/app-accessibility/emacspeak/emacspeak-9999.ebuild
@@ -1,31 +1,38 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-NEED_EMACS=24
+NEED_EMACS=26.1
 FORCE_PRINT_ELOG=1
 DISABLE_AUTOFORMATTING=1
-inherit elisp readme.gentoo-r1
+inherit elisp toolchain-funcs readme.gentoo-r1
 
-if [[ ${PV} == "9999" ]] ; then
+DESCRIPTION="The emacspeak audio desktop"
+HOMEPAGE="http://emacspeak.sourceforge.net/"
+
+if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/tvraman/emacspeak.git"
 	inherit git-r3
 else
-	SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2"
+	SRC_URI="https://github.com/tvraman/emacspeak/releases/download/${PV}/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~ppc ~x86"
 fi
 
-DESCRIPTION="the emacspeak audio desktop"
-HOMEPAGE="http://emacspeak.sourceforge.net/"
 LICENSE="BSD GPL-2"
 SLOT="0"
 IUSE="+espeak"
 
-DEPEND="espeak? ( app-accessibility/espeak )"
-
-RDEPEND="${DEPEND}
-	>=dev-tcltk/tclx-8.4"
+# Usually need := dep with tcl anyway but in particular, it's needed
+# here as we do a version check in src_compile and bake in the results.
+DEPEND="
+	dev-lang/tcl:=
+	espeak? ( app-accessibility/espeak-ng )
+"
+RDEPEND="
+	${DEPEND}
+	>=dev-tcltk/tclx-8.4
+"
 
 DOC_CONTENTS='
 As of version 39.0 and later, the /usr/bin/emacspeak
@@ -35,9 +42,13 @@ by adding the following to your ~/.emacs file:
 (load "/usr/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.el")
 '
 
-HTML_DOCS=( install-guide user-guide )
+HTML_DOCS=( info/ )
 
 src_configure() {
+	MAKEOPTS+=" -j1"
+
+	tc-export CXX
+
 	emake config
 }
 
@@ -45,33 +56,39 @@ src_compile() {
 	emake emacspeak
 	if use espeak; then
 		local tcl_version="$(echo 'puts $tcl_version;exit 0' |tclsh)"
-		if [[ -z $tcl_version ]]; then
+		if [[ -z ${tcl_version} ]]; then
 			die 'Unable to detect the installed version of dev-lang/tcl.'
 		fi
-		cd servers/linux-espeak || die
+
+		cd servers/native-espeak || die
 		emake TCL_VERSION="${tcl_version}"
 	fi
 }
 
 src_install() {
 	emake DESTDIR="${D}" install
-	rm "${D}/usr/bin/emacspeak"
+
 	if use espeak; then
-		pushd servers/linux-espeak > /dev/null || die
+		pushd servers/native-espeak > /dev/null || die
+
 		emake DESTDIR="${D}" install
-		local orig_serverdir="/usr/share/emacs/site-lisp/emacspeak/servers/linux-espeak"
-		local serverfile="${D}${orig_serverdir}/tclespeak.so"
-		install -Dm755  "$serverfile" \
-			"${D}/usr/$(get_libdir)/emacspeak/tclespeak.so" || die
-		rm -f "$serverfile" || die
-		dosym "/usr/$(get_libdir)/emacspeak/tclespeak.so" \
-			"$orig_serverdir/tclespeak.so"
+		local orig_serverdir="/usr/share/emacs/site-lisp/emacspeak/servers/native-espeak"
+		local serverfile="${ED}${orig_serverdir}/tclespeak.so"
+
+		install -Dm755 "${serverfile}" \
+			"${ED}/usr/$(get_libdir)/emacspeak/tclespeak.so" || die
+		rm -f "${serverfile}" || die
+
+		dosym -r "/usr/$(get_libdir)/emacspeak/tclespeak.so" \
+			"${orig_serverdir}/tclespeak.so"
 		popd > /dev/null || die
 	fi
-	dodoc README etc/NEWS* etc/FAQ etc/COPYRIGHT
+
+	dodoc README etc/NEWS* etc/COPYRIGHT
 	einstalldocs
-	cd "${D}/usr/share/emacs/site-lisp/${PN}" || die
-	rm -rf README etc/NEWS* etc/FAQ etc/COPYRIGHT install-guide \
+
+	cd "${ED}"/usr/share/emacs/site-lisp/${PN} || die
+	rm -rf README etc/NEWS* etc/COPYRIGHT install-guide \
 		user-guide || die
 	readme.gentoo_create_doc
 }
diff --git a/app-accessibility/emacspeak/metadata.xml b/app-accessibility/emacspeak/metadata.xml
index 85a649a04b8e..b4f85db5b90c 100644
--- a/app-accessibility/emacspeak/metadata.xml
+++ b/app-accessibility/emacspeak/metadata.xml
@@ -17,6 +17,7 @@
 		<flag name="espeak">Adds support for the espeak tts engine</flag>
 	</use>
 	<upstream>
+		<remote-id type="github">tvraman/emacspeak</remote-id>
 		<remote-id type="google-code">emacspeak</remote-id>
 		<remote-id type="sourceforge">emacspeak</remote-id>
 	</upstream>
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 308a9be7337c..22e8553f6368 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/cabextract/Manifest b/app-arch/cabextract/Manifest
index 24d7b22e58b1..7cfb3302b38b 100644
--- a/app-arch/cabextract/Manifest
+++ b/app-arch/cabextract/Manifest
@@ -1,10 +1,4 @@
-AUX cabextract-1.9-fix-bigendian.patch 424 BLAKE2B ce74e2a626705cc82a76852d97701329477d1956463a6c589a1f005462cfb5ca7cf61f86e651da793fdef8fbb6e17115d312da666d5168190967eb69f4633548 SHA512 70c07f4bdea2be135d7f24c7b24ab1f8a672b3772226e47bfa13b065cb73ec7f2fb3c1ad3ed1bda3f3a3d8ee6774ae90163b5702be300f058d9f028bd85f6b9e
-AUX cabextract-1.9-remove-spurious-test_files.patch 423 BLAKE2B 33c226d287ab77a3bf7388093149ebace4542112ce4fcdd6a2a8808858da44d1278a89ba5f415de84d2f4a1475af3f0f863c1401b2a091d5ce7192f6d52caddb SHA512 8f6bc900cb04d2177b6a179ef91046cf47fdada15118ad530d588ccab1ae4c7617d851a2cf36c73018f336c812564b0d6abdee1bd549330aa19ba9cbfc7d17d7
-DIST cabextract-1.8.tar.gz 289256 BLAKE2B ba9fea0cd12859b0de97b13362eaf276066650eb7151e0115af7ed2586cfa7497f72be2f9287d3ccb5ce5256ec26ca69e729df5bb0a327bb9f32ded25391460c SHA512 f8d676d6b738b0b13ac1cac7716c2fb46db423ef30b05ee64f00fcb19596131fbd34341c8b417af3de04896e9b6a8abf0d5976ee4bf87d016806a71317246d7a
 DIST cabextract-1.9.1.tar.gz 469369 BLAKE2B 5bfc697b40cbf47b42ab7857804b703c9622d8dae1648aae1bb5c0ec7c7978bff01b7ca2526f1b6090f193d88c00e3f49ae111f348d03fec9f575bddbb4b4096 SHA512 c354a4b20a222b40813f01baf8311c9a76611da427f9f44e977a3fd09508e24a18b486e3eef889a9debdca459f1b0c28d5d25429ccd555d3a2e4ff92d91cec14
-DIST cabextract-1.9.tar.gz 466334 BLAKE2B 1a82bddca826ee35ed13e1c0b50deca3ae1b7e31d7f427f54b5d6cf9651a727b7cbf8049c1a4326237725e007baecb4356721489611bb5e015bd7460e2530758 SHA512 d144c1df9ed8e8c339bcadb3d1be2eb2576bb066e3f75a3480df0d5e81407a633554e4674b3bb43716c0cf33a0f2327e6f798cd6d7825bceefa0ad839fcc3f64
-EBUILD cabextract-1.8.ebuild 1108 BLAKE2B ac14bcc3a82f56b70258739c6c7823c83d20d080c49f62efc32de8104516cbd8dc34c06c63dbbc628b44103f7f50f73da09c8521ba468745fa7487a9661d17d8 SHA512 075916d28ef1e018f3ca9aa453be855e22b22b1a09e98615368e10a2ef1329c070f0c9f25b09c03ead7222c98624196ca73727fc3eff0877b772fb790b78d0f2
-EBUILD cabextract-1.9-r2.ebuild 1648 BLAKE2B 5c56e7d754c52d341d5ba291898befa3f61ede8ece49ff867dbde85a0315d7928770095386d5b0f15ddaeb729ab2635f0cd140fb4286661263bcba58273538f6 SHA512 ddd7bc7ad0328f148005f5550eee24cacb943a17a0e7333fef3ee1cf8e83125fbab7958ee4e30c6ea9b8ecf79af202fb69c3d4b7b449a623354acb0b8092d2b2
 EBUILD cabextract-1.9.1.ebuild 1561 BLAKE2B 876a0ff86a4b9c3acde92aee219dfbdea9c4b839022f4078b87d3fd0e20722db5618a53721bfbb41cc48fa3a9f1417bb8c70733af3c1b30d20f3181b8d9dc262 SHA512 7859df366f5784b02d62f90fc3d7bf875ac6d0adaf9757c6a071a22d3f768ebf27baa2480a177be407af82e0d73ba80cb4868c3a13f69a30f28298cd8ddf2f81
 EBUILD cabextract-9999.ebuild 1542 BLAKE2B d90ce5df206272e2b8529409d494f606e70106e90de56ef3ec72e64cbad7f0b26a1b16c7b5195d3d146de41c5748b24c02ddb94d5734b9a8ed59a8d27914c450 SHA512 db05f7fbce13f706b5f24462e563d0d790f57d3f92e570705721b06df703ca62e1163078c3b5e5bd184c207a2e23fb45d37d1fc48eedb02ed43de406f2944cc7
 MISC metadata.xml 556 BLAKE2B 56968f48613cd1c331acb6a8013e998d96e9da101dd4bc15bf98381501923087ba5bb49ff6e0b52d6e5fb01121bc543f05c90ce7f2657c871ce0ef07eab16212 SHA512 21a53a5f845a8cebecec884cef051b6f073a9e9009c44d033b90ba5b06d8d2dcfabd0ee3082926e60faebbb6ef297d624313cea1a22308ee1c5de88b834dd71d
diff --git a/app-arch/cabextract/cabextract-1.8.ebuild b/app-arch/cabextract/cabextract-1.8.ebuild
deleted file mode 100644
index acb8183e9aa5..000000000000
--- a/app-arch/cabextract/cabextract-1.8.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
-
-inherit toolchain-funcs
-
-DESCRIPTION="Extracts files from Microsoft cabinet archive files"
-HOMEPAGE="https://www.cabextract.org.uk/"
-SRC_URI="https://www.cabextract.org.uk/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="extras"
-
-RDEPEND="extras? ( dev-lang/perl )"
-
-src_prepare() {
-	default
-	# the code attempts to set up a fnmatch replacement, but then fails to code
-	# it properly leading to undefined references to rpl_fnmatch().  This may be
-	# removed in the future if building still works by setting "yes" to "no".
-	export ac_cv_func_fnmatch_works=yes
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	local DOCS=( AUTHORS ChangeLog INSTALL NEWS README TODO doc/magic )
-	default
-	docinto html
-	dodoc doc/wince_cab_format.html
-	if use extras; then
-		dobin src/{wince_info,wince_rename,cabinfo,cabsplit}
-	fi
-}
diff --git a/app-arch/cabextract/cabextract-1.9-r2.ebuild b/app-arch/cabextract/cabextract-1.9-r2.ebuild
deleted file mode 100644
index e8fcac6043f4..000000000000
--- a/app-arch/cabextract/cabextract-1.9-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/kyz/libmspack.git"
-	inherit git-r3
-	MY_P="${PN}-9999"
-
-	LIBMSPACK_DEPEND="~dev-libs/libmspack-9999:="
-else
-	KEYWORDS="~alpha amd64 arm hppa ~ia64 ~loong ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-	MY_PV="${PV/_alpha/alpha}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://www.cabextract.org.uk/${P}.tar.gz"
-
-	LIBMSPACK_DEPEND=">=dev-libs/libmspack-0.8_alpha:="
-fi
-
-DESCRIPTION="Extracts files from Microsoft cabinet archive files"
-HOMEPAGE="https://www.cabextract.org.uk/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="extras"
-
-DEPEND="${LIBMSPACK_DEPEND}
-	virtual/pkgconfig"
-RDEPEND="${LIBMSPACK_DEPEND}
-	extras? ( dev-lang/perl )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-bigendian.patch
-	"${FILESDIR}"/${P}-remove-spurious-test_files.patch
-)
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		# Re-create file layout from release tarball
-		pushd "${WORKDIR}" &>/dev/null || die
-		cp -aL "${S}"/${PN} "${WORKDIR}"/${PN}-source || die
-		rm -r "${S}" || die
-		mv "${WORKDIR}"/${PN}-source "${S}" || die
-		popd &>/dev/null || die
-	fi
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-external-libmspack=yes
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	local DOCS=( AUTHORS ChangeLog NEWS README TODO doc/magic )
-	default
-	docinto html
-	dodoc doc/wince_cab_format.html
-	if use extras; then
-		dobin src/{wince_info,wince_rename,cabinfo,cabsplit}
-	fi
-}
diff --git a/app-arch/cabextract/files/cabextract-1.9-fix-bigendian.patch b/app-arch/cabextract/files/cabextract-1.9-fix-bigendian.patch
deleted file mode 100644
index 760dd9dbb013..000000000000
--- a/app-arch/cabextract/files/cabextract-1.9-fix-bigendian.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://github.com/kyz/libmspack/commit/c19e707936947b45cf05bc9aaee68517c6c2aca6
-
----
- configure.ac  | 1 +
- 1 files changed, 1 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -30,6 +30,7 @@ AC_CHECK_HEADERS([inttypes.h])
- # Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
- AC_C_INLINE
-+AC_C_BIGENDIAN
- AC_TYPE_MODE_T
- AC_TYPE_OFF_T
- AC_TYPE_SIZE_T
diff --git a/app-arch/cabextract/files/cabextract-1.9-remove-spurious-test_files.patch b/app-arch/cabextract/files/cabextract-1.9-remove-spurious-test_files.patch
deleted file mode 100644
index d80b8704834c..000000000000
--- a/app-arch/cabextract/files/cabextract-1.9-remove-spurious-test_files.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://github.com/kyz/libmspack/commit/2f78851e3927b05931574b380ca6dccaf91e3807
-
----
- test/bugs.test | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/test/bugs.test
-+++ b/test/bugs.test
-@@ -2,7 +2,7 @@
- # test that known crash bugs remain fixed
- . test/testcase
- 
--$cabextract -t $test_files/bugs/*.cab
-+$cabextract -t bugs/*.cab
- 
- # fail if exit code indicates a crash (SIGBUS, SIGSEGV, etc.)
- test $? -le 1
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 2db4c59016d5..d89ecae8f7f1 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index faf31357174b..d228583c3e17 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -16,6 +16,6 @@ DIST qemu-7.0.0-docs.tar.xz 5101176 BLAKE2B 827d4af2b3fd229d146b47253d12a8bfd606
 DIST qemu-7.0.0.tar.xz 125117636 BLAKE2B ceda6d9f1a585298bd49fed61e8bb35f0064ad8388a9f979c8bd68a38bfe1a47c5bb055e5f74f970c2c440957042b9de4a861524120040c56e4cd8b56c5cfb68 SHA512 44ecd10c018a3763e1bc87d1d35b98890d0d5636acd69fe9b5cadf5024d5af6a31684d60cbe1c3370e02986434c1fb0ad99224e0e6f6fe7eda169992508157b1
 EBUILD qemu-7.0.0-r1.ebuild 25838 BLAKE2B 875e737a2d9c56343df88972d479ca661d9cef981d44c8b176e9aa6cee06d578cbf57aa4bd8e5b6396134a91b56de5f6a1f29b6a1903d4ce90f4426b438d8a6b SHA512 f52a03cf93d1faae0fd6363f5797ada9c63138c4adaea5245ccb15d86a997aba1707107c2cda97e4f36b22733bfeb0fe46767b7886c2ec81b275755c95dd1b3a
 EBUILD qemu-7.0.0-r2.ebuild 26304 BLAKE2B 478452308df45bf5f466e644cb732b592e10d9c0d66500b64bf8dd33e3471a3663b774824be2169fa65c4c50dbbd721940753d2fe1c4b65afd413231bc73ff24 SHA512 e7400db9efa895d59b5ecb9df59627439dd9a949c893aaf4d28abb6b69247b79115172f377319cca054b5f068fc1ace20d6666b78a14f786e6dcf444568df16d
-EBUILD qemu-7.0.0-r3.ebuild 27258 BLAKE2B 0a430261084bfb81b1758a52b19f95ffdaa6b3e4340eac75d1648d45bc65108bfaad1b48a35fbb2abde164be6a3459ff3b6d81df58a64440d70a2ca4af3c3fcd SHA512 5b3a4a1da513a289b6e189c324b836cf25b473a0c0001f7608176728438313f14d76918106dfba8b4f910c9fc929b611b772fccd314c173a652bf436a263b06b
-EBUILD qemu-9999.ebuild 27123 BLAKE2B 226e3d74476797e18dbeec36e6d976fba1c1298e336c1af049f3d1aaf375ca7da6f1e1b7fed2a45e97a6134a6b667cf34da1929d81db6bf89efda4e9f1b8a574 SHA512 72005ad77f56bc7161fd27cfcab4fce6e211b5cc5342420ee9b3e7f021af31a04565e9958fba7883286a6d3187b6888d05bc2ac96306370709377bba972f8c34
+EBUILD qemu-7.0.0-r3.ebuild 27242 BLAKE2B 30905d095fd4b69d8dda94e2e084d796427fd5c46eccef0316e38c9e57a09ec51e2cd6734e77ea0d37dece86b745aa76fd619e3faac5ac47bb0de15a9358b090 SHA512 f59daddc310ce032f6eeff4c2d13c466d1f5e780c69331a37f67d929d74d97bbba9051309ffd0ab71210f53aea6d03ccb3d075ef1a02d339a4fff94659e5ac8f
+EBUILD qemu-9999.ebuild 27107 BLAKE2B 5c85ab3e8a0e2a70321e664508674be93d7034072a52f769b395f4449848fb315b42355ca14a8f997fcb6d49955ba18ce064e5d300fa22993100b383dfa7758d SHA512 ed288b41161b9fef1ca291f61845b4feef38a91fa94e522cae0ecb27064cd943313975f700b7c4e4b6cdbba5d6599431a137875b54097db8ffcb1f3b73427db0
 MISC metadata.xml 4672 BLAKE2B ea2319ecc6717e4f10667f70928eac2b59eb27bb117957c266984a4d5bdf84604128086956a651c1880d314efde56ce81a67c364f7944f5342b6a322b5e3e73e SHA512 27f357299abc6a82112dab17c81b825459ce4c7afd96381b4cba13d79861f80e7d452d574795cab240e7ca56154128a2597ac9957aa24ef81d7dc9092312ac79
diff --git a/app-emulation/qemu/qemu-7.0.0-r3.ebuild b/app-emulation/qemu/qemu-7.0.0-r3.ebuild
index e0be1218e152..5136fb92084e 100644
--- a/app-emulation/qemu/qemu-7.0.0-r3.ebuild
+++ b/app-emulation/qemu/qemu-7.0.0-r3.ebuild
@@ -6,7 +6,8 @@ EAPI=8
 # Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
 # Set to 1 if prebuilt, 0 if not
 # (the construct below is to allow overriding from env for script)
-QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
+: ${QEMU_DOCS_PREBUILT:=1}
+
 QEMU_DOCS_PREBUILT_DEV=sam
 QEMU_DOCS_VERSION=$(ver_cut 1-3)
 # Default to generating docs (inc. man pages) if no prebuilt; overridden later
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index f10fc57e1950..e4f37bb04fdd 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -6,7 +6,8 @@ EAPI=8
 # Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
 # Set to 1 if prebuilt, 0 if not
 # (the construct below is to allow overriding from env for script)
-QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
+: ${QEMU_DOCS_PREBUILT:=1}
+
 QEMU_DOCS_PREBUILT_DEV=sam
 QEMU_DOCS_VERSION=$(ver_cut 1-3)
 # Default to generating docs (inc. man pages) if no prebuilt; overridden later
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 8de3841b4410..2c885acedef3 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-fontconfig/Manifest b/app-eselect/eselect-fontconfig/Manifest
index 100d709be3e2..3d93f531e9ef 100644
--- a/app-eselect/eselect-fontconfig/Manifest
+++ b/app-eselect/eselect-fontconfig/Manifest
@@ -1,6 +1,3 @@
-DIST fontconfig.eselect-1.1.bz2 1713 BLAKE2B 30af0471a52d7e2785e6e0e5847f51f3a11d0fb53eb800a5314e18dbb61694f1542d71c3e0f4ceccf82a396432113529b0fdb1b5fc6eba37550b27410565c61e SHA512 3b5978e20009754f09cd39e39771e8151cbb7bda60378cda718182b2df2c267a64af5ead220a079fbeeffb30586bc432bbc83b94e4f910205c4a29040cd2ccbd
 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 738 BLAKE2B 1fc57c89383111c107f0098839be1c9850a5e9ff25ef66139cf0e25cf74016665cc3abcf390a3be50f9092c488130f80861c9972a9a7ac90c4d034e7f2e40bc4 SHA512 bd25cb458fc2b86ba703172acba35ef390a9acf3a2ccbc432b094c2b1ea62444f31759d89e18df871c41e53e915e7612021cbbebe601a3161e50e951a81ea66c
 MISC metadata.xml 263 BLAKE2B 0b50fbf82dc925c031f1c1fe78929960b5aa70f4ec80bdd34cec9017ac9f07f9a3960421fe5a6a7f9b728c89570aed37fc1460c3f300da751794f1e527079db3 SHA512 a1d548b6228cd790b0b5147752c5495017391cfec3065bd6ea8ee5f8e1f86905220f6b764e71531627323a29d1218b60d36b6b23e9ca585775df12c260a6b311
diff --git a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
deleted file mode 100644
index b1ec7ad165d4..000000000000
--- a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="An eselect module to manage /etc/fonts/conf.d symlinks"
-HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-fontconfig.git"
-SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/fontconfig.eselect-${PV}.bz2"
-
-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"
-IUSE=""
-
-RDEPEND=">=app-admin/eselect-1.2.3
-		 >=media-libs/fontconfig-2.4"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	newins "${S}"/fontconfig.eselect-${PV} fontconfig.eselect
-}
diff --git a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r2.ebuild b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r2.ebuild
deleted file mode 100644
index d64c2bca973e..000000000000
--- a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="An eselect module to manage /etc/fonts/conf.d symlinks"
-HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-fontconfig.git"
-SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/fontconfig.eselect-${PV}.bz2"
-
-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"
-
-RDEPEND=">=app-admin/eselect-1.2.3"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	newins fontconfig.eselect-${PV} fontconfig.eselect
-}
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index d2aa561ce0f7..c068ac8cef57 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/dbskkd-cdb/Manifest b/app-i18n/dbskkd-cdb/Manifest
index 47728605d54c..fabbb32fffa4 100644
--- a/app-i18n/dbskkd-cdb/Manifest
+++ b/app-i18n/dbskkd-cdb/Manifest
@@ -1,7 +1,5 @@
 AUX dbskkd-cdb-gentoo.patch 505 BLAKE2B c97ca86f77514ee8a887a2091449a44aa20180c4e5f10582656cb298f7a361b16dd7bfed7cb4a7b6a1a3543218f63e3f3b6706a5cb8b078c10c5b5f83828eb72 SHA512 015ffd8bb191ef1d16ce367fb9e8dd6cbade11f5fe24e4302f9781b679f07bd37376bee1a04e34e439f1b8858c4dda4a39a008bd421cca7097cb6762389dcadf
 AUX dbskkd-cdb.xinetd 239 BLAKE2B 46b6b7bafff05f00ea2d1e6420cf443e490e2692ec96065b25c14e41ca7adfbec80d3d9a2dbbe5c848c81a6da7da0a19a2815ef4af5320e2a4a91539abbe1e39 SHA512 a7efd15b7676b857b2adcc23df023f5af8d29a7357b77ab3fcb494fe6cbd401b28caf51f4f3ded5432bed0a3f1d29b0cc65148f3a8e083ebce70a0aca0437915
-DIST dbskkd-cdb-2.00.tar.gz 9296 BLAKE2B d863e2a05cdcf9c8c030c2e3cc2a46a22f5bb01d844ee5120d686a672952ff2609f994fe8a4915daa5b293357f3da87cc9f702f7307dc162a20ffd0a7d47f804 SHA512 3582728d2a1917c00437b273208fa150a5a32dcd462752c6751ddbd574ca7f1476b2aca0d2613471a800bd17f80e2c4b60846f9056ae621996f8f5a5592fa22a
 DIST dbskkd-cdb-3.00.tar.gz 9380 BLAKE2B 81b167485a0ac287c01a5cab2fc638d4303bb8e1529dfc14b89ba8242915de38165acba5d0df00714bf8b1c5b190b3cf655e654e96bae5081bd3fba1f71e7a6a SHA512 a3fe5a0f2e96828d22a75e4daf36eecaa8d903efe8c8a5f6972178f52dc01cac5df5f3e1d8a2cf684d6b78a9c10c207b655a296ceb456dec9f0e502142de094b
-EBUILD dbskkd-cdb-2.00-r1.ebuild 1205 BLAKE2B e36202358b631f98731dc6283e54312f2c4e35929ac09c26c6082f338520f13c4415130fc0e6e03e536774add50ed009b1296db98279e314af6a4462b61099c4 SHA512 3d04cd19f93f57c2bb00de464a3efcde1ef5df7837591d0ebbcb37f623c911d2757b0fa659e472e00be3d7be7ac8aca44b11f593f14b84fecd92e7a267144511
-EBUILD dbskkd-cdb-3.00-r1.ebuild 1182 BLAKE2B 5d7e69c1689cf0954636b6e89cbb5facaa4db192971ac8d55fdfb30158a25bb24b045e1d8903cbc0dbe2f68dddf4e34f50b62cc265d414696f418bb0ac38a2cc SHA512 4302fce368a8e7dc236ecde42f5c9d41f7da80a0c4b70d406d88909967193d254db803c3f1303c02426db8025c0edc5fdc1db67419724b00951c7e7007b08a95
+EBUILD dbskkd-cdb-3.00-r1.ebuild 1181 BLAKE2B 987e2d1f53e1196fbd1b0b1d7d26b378518cf206d91104fc2708dbd27bcc9171cdfc5ae7a6ecd0517365352839948cf77dac1470315b6408e9fd105929b4ede1 SHA512 039cb2c877c261227b9261d4703586d0a73e4b0938846742fd5d766dcdeba2da50527babf23f28bad87a9acc92ca42b63a0340df66b610f33e3a3c733737a92f
 MISC metadata.xml 327 BLAKE2B f3b5ef65193e0458cccd800234850d979d0311d7d03b416d5e9417647ad6d42a5f3227899edf9c5160dc79d4aef6b221e90f8bd6a25e235f12b851f5a9d00164 SHA512 ecd6fd890139f320f0ea97995a85115abd3d3c72dd56e54c62358c83284c55f338d3c9a5978a013a979b6d5f5ece0aea45d793cb984e4e313020dce096e1a622
diff --git a/app-i18n/dbskkd-cdb/dbskkd-cdb-2.00-r1.ebuild b/app-i18n/dbskkd-cdb/dbskkd-cdb-2.00-r1.ebuild
deleted file mode 100644
index f63e8826adc0..000000000000
--- a/app-i18n/dbskkd-cdb/dbskkd-cdb-2.00-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="SKK dictionary server based on cdb"
-HOMEPAGE="https://github.com/jj1bdx/dbskkd-cdb"
-SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND="|| (
-		dev-db/tinycdb
-		dev-db/cdb
-	)
-"
-
-RDEPEND="
-	acct-group/dbskkd
-	acct-user/dbskkd
-	app-i18n/skk-jisyo[cdb]
-	sys-apps/xinetd
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
-
-src_prepare() {
-	default
-
-	local cdblib=()
-	if has_version dev-db/cdb; then
-		append-cflags -I"${EPREFIX}"/usr/include/cdb
-		local a
-		for a in cdb.a alloc.a buffer.a byte.a unix.a; do
-			cdblib+=( "${EPREFIX}"/usr/$(get_libdir)/${a} )
-		done
-	else
-		cdblib+=( -lcdb )
-	fi
-
-	sed -i "/^CDBLIB/s|=.*$|= ${cdblib[*]}|" Makefile
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		COMPAT="-DJISYO_FILE=\\\"${EPREFIX}/usr/share/skk/SKK-JISYO.L.cdb\\\""
-}
-
-src_install() {
-	exeinto /usr/libexec
-	doexe dbskkd-cdb
-	dodoc *.txt
-	einstalldocs
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/dbskkd-cdb.xinetd dbskkd-cdb
-}
diff --git a/app-i18n/dbskkd-cdb/dbskkd-cdb-3.00-r1.ebuild b/app-i18n/dbskkd-cdb/dbskkd-cdb-3.00-r1.ebuild
index 574feab4cd70..71c55dbae3fb 100644
--- a/app-i18n/dbskkd-cdb/dbskkd-cdb-3.00-r1.ebuild
+++ b/app-i18n/dbskkd-cdb/dbskkd-cdb-3.00-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jj1bdx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND="
 	|| (
diff --git a/app-i18n/freewnn/Manifest b/app-i18n/freewnn/Manifest
index 88f32c0a1909..b82cb62600b9 100644
--- a/app-i18n/freewnn/Manifest
+++ b/app-i18n/freewnn/Manifest
@@ -1,11 +1,8 @@
-AUX freewnn-1.1.1_alpha22-parallel-build.patch 6089 BLAKE2B f73fad172a062d2f6eaac6e5d0d87487e2407c14f853d6cbb6d75c26266ad61cab5b1b20e25f5c123fc854b56746fea39a7747bd4244592a9bf9bd1adfedef01 SHA512 941344392312412fb4f5b42c51df1c58d1efc050e203d54894d4bcd921e884ac82fcf5a29a3a57aa4be88da57586dfa9674b8ea88dcb75e91efe83caaa78ac50
 AUX freewnn-Wformat-security.patch 3658 BLAKE2B 4bce67e8190ec4a6e6a4b8cee446b8beb492057cfedd49c06e631a5949e9ff20b35c4defe9ed0466dc2f0b5edb8a483f5886b8eda30a77435ee8614b0878d7f6 SHA512 7e01d516978eb024fe723a84c6c7cc8e138e7947ed3d4d5ec6e15b28783498e084cd2655ccd2ce7377c9837332ae1b0caec654c0f7f2bb9f78b9657f4cd00830
 AUX freewnn-uum-EUC-JP.patch 279 BLAKE2B a0fe740a49aabb72f8d9b0bcbae59e5841152c02ebb4bb27817c8621a4e6be2fd17b8a18c5104d94f8c7def90342682a015a98883856027901265a11d7d4aa4c SHA512 a065873fe70435a4364a111eed334ea574cd3178ffde947beabac5bb45e468a725f73c5b35c22b577127d03139a6386eebc815b85014048eaf59ca958687c96b
 AUX freewnn.confd-r1 16 BLAKE2B 2a2b2a93adf66e719f035900b0efa1f7ccf66912f8c5cddddb8e7b7c1e83c91136d4e747e1b96cad6a54fbbddc29a6b61fc37f7f01330909d27fc1f0cf978723 SHA512 3392644bb5404b83ee3bf3bceffaa769d1dce858fd2a8bd92b79101d0db863002a4f30205498a00777b25b7940fc8dbb41a0e0c4e20be0f6d61be50eb4ddf49e
 AUX freewnn.initd 283 BLAKE2B 363b8b99876aa0552f49a10bc973925d7d23900c24601e40ff2c99a3d6476c9b41c60465feb9e01e6fb17324957bb810d63eef52d97b49a61e0f48c96452db6e SHA512 81b5a6246d513f567710e2973bc8fffe86462e8afdee13e1a2aa9b6e5e8a852521a23fd5b20af536092b59f626a5e34be77409d63dcab005473dd11631b67111
 AUX freewnn.initd-r1 306 BLAKE2B 2c5eeede614062832ce9d799e228a7927793679aa129151b68c9f1392056c8faccda4ce3dff5b4dc0f9da5d1557c8799ca663c1b20d9c3b2208b72a26f78adc3 SHA512 306ad8dd6ae7060fc937f2ac2b266f385480961ed0c2074f1dcfc77fa82bb7a23042019672b47c32fc8d55079730ccda68c616c0f5411b0704db2c34d2caaf02
-DIST FreeWnn-1.1.1-a022.tar.bz2 3137954 BLAKE2B 1f3a920ef7ddb4cddaa95de4d60bccf20c8e6d207216e406cb7dc503411e932b4578ed1c3c302249a94e0ede1d948aa62f5ced804d0d142ed5e04dbbd6789277 SHA512 938c8bff69e2f43cce265a6a84822ae08b89725837f808addb66ba202dadafa60c213638f298d9efe1257fd96f7193fd711a3dacecd803289d925d8f6ea6eaf3
 DIST FreeWnn-1.1.1-a023.tar.bz2 3147378 BLAKE2B 63f3fbf37b53e5e6f32f83513d45aaf4915cbd33789ab8edfc93b22de1fbbe242e52e7bd40ce7ef22e24ae1f4ee151261c2041af9c78720875303b5d2b6c18a8 SHA512 f0b8c657f0441463c752314b7d2fd603b4df056b049d247ecd77ff8b2f2f837fed7e75ce89deabca7061d3126afd51bf301bcdd3ac429056f43bfc8e0c7c8385
-EBUILD freewnn-1.1.1_alpha22-r1.ebuild 1143 BLAKE2B 2f4411d1112e6d61fead2a04aedd9a9f5d5e6f0d638466397fc967fd11a254ca3b42cf17801e74560512bf9c353e5bf143d7ce1d270b3fbfe4d0b3497acc24e3 SHA512 bc7b353fc06e19a81a66a954da2bca6d337fb241a7de28bc9eed3a1914e6902b8049053ee13469278e441b44bd321640124108d7c0fddd1fc134f35ca80eb147
-EBUILD freewnn-1.1.1_alpha23-r1.ebuild 1612 BLAKE2B 32ae1dc476107df7c0c3043f2afd0c62df914a4110921289d2b8e40f28f893d0d320cf1809d822c2a50f3d3298a9dab3f0cf09b5eaa4da79bf780efad0f3e051 SHA512 7eced2d6981a23ee1a78fb7ea3c268051c0f5f678898a369eeb60ab78d6568ac578f38c43f9b7b3c19ce59a183aa0dfdf97383f7cffc2c4927c4f4587afdc7a8
+EBUILD freewnn-1.1.1_alpha23-r1.ebuild 1611 BLAKE2B 86003ec77fa150c5e733aa75332d3d40c1535e8e7982019e7b09aded549b04309679b9785394b1d1a4a761334a997ab57fa2cfaab6c57730d9db8727dd94d9c9 SHA512 87654f7839c034d2117d59377c0989af59867d27bb8315075f450ce92e8da8c6f36f3bfb57744e53eddb4c728094c9d9a5993fee23bd9951b388517a84f4d2f5
 MISC metadata.xml 370 BLAKE2B 4af1f1ad79d90077709e87ce1e65cca7ba4953d067ddee1dfbe6e6e605ebf80f63927012276c5c11e98c1a06717fcec433f0dca9c722f6a6cc88bf6208f07de8 SHA512 42405726236b8a4c7f95479583edafd1b78d0537930f668126c6d429d9fe8af141fe76c8dc2d506ed16614d02f920f81bee1f47cd7274aaf297b2e7255e10f19
diff --git a/app-i18n/freewnn/files/freewnn-1.1.1_alpha22-parallel-build.patch b/app-i18n/freewnn/files/freewnn-1.1.1_alpha22-parallel-build.patch
deleted file mode 100644
index 058225c36ee5..000000000000
--- a/app-i18n/freewnn/files/freewnn-1.1.1_alpha22-parallel-build.patch
+++ /dev/null
@@ -1,318 +0,0 @@
-Description: Fix potential race condition when building in parallel mode
-Origin: upstream, http://cvs.sourceforge.jp/cvs/view/freewnn/FreeWnn/Wnn/pubdicplus/Makefile.in?r1=1.7&r2=1.8&view=patch
-Bug-Debian: http://bugs.debian.org/724058
-
---- a/Wnn/pubdicplus/Makefile.in	2010/02/22 17:06:54	1.7
-+++ b/Wnn/pubdicplus/Makefile.in	2013/11/08 18:54:44	1.8
-@@ -1,5 +1,5 @@
- #
--#   $Id: Makefile.in,v 1.7 2010/02/22 17:06:54 aonoto Exp $
-+#   $Id: Makefile.in,v 1.8 2013/11/08 18:54:44 aonoto Exp $
- #
- 
- #
-@@ -10,7 +10,7 @@
- #                 1987, 1988, 1989, 1990, 1991, 1992
- # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
- # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992
--# Copyright FreeWnn Project 1999, 2000, 2001, 2002, 2004, 2010
-+# Copyright FreeWnn Project 1999, 2000, 2001, 2002, 2004, 2010, 2013
- # 
- # Maintainer:  FreeWnn Project
- # 
-@@ -42,13 +42,12 @@
-            ATOF = $(WNNJUTILOBJ)/atof
-        WNNTOUCH = $(WNNJUTILOBJ)/wnntouch
-           HINSI = @HINSI_DATA@
--       FZK_FLAG =
- 
- LINKS = Version bio.hd chimei.hd computer.hd fzk.attr fzk.con fzk.fzkattr fzk.jirattr  fzk.jircon fzk.master fzk.shuutan jinmei.hd kihon.hd koyuu.hd setsuji.hd special.hd special.u symbol.hd tankan.hd
- 
- WNNDICS = bio.u chimei.u computer.u jinmei.u kihon.u koyuu.u setsuji.u symbol.u tankan.u
- 
--FZK_SRC=          fzk.master          fzk.attr          fzk.jirattr          fzk.fzkattr          fzk.jircon          fzk.con          fzk.shuutan
-+FZK_SRC=          fzk.master-.c          fzk.attr          fzk.jirattr          fzk.fzkattr          fzk.jircon          fzk.con          fzk.shuutan
- 
- DIC= 	bio.dic 	chimei.dic 	computer.dic 	jinmei.dic 	kihon.dic 	koyuu.dic 	setsuji.dic 	special.dic 	symbol.dic 	tankan.dic
- 
-@@ -68,24 +67,14 @@
- 	$(RM) $@
- 	$(LN) $? $@
- 
--includes:: Version
--
- depend:: Version
- 
--clean::
--	$(RM) Version
--
- bio.hd:  $(PUBDICPLUSSRC)/bio.hd
- 	$(RM) $@
- 	$(LN) $? $@
- 
--includes:: bio.hd
--
- depend:: bio.hd
- 
--clean::
--	$(RM) bio.hd
--
- # bio.u:  $(PUBDICPLUSSRC)/bio.u
- #	$(RM) $@
- #	$(LN) $? $@
-@@ -101,13 +90,8 @@
- 	$(RM) $@
- 	$(LN) $? $@
- 
--includes:: chimei.hd
--
- depend:: chimei.hd
- 
--clean::
--	$(RM) chimei.hd
--
- # chimei.u:  $(PUBDICPLUSSRC)/chimei.u
- #	$(RM) $@
- #	$(LN) $? $@
-@@ -123,13 +107,8 @@
- 	$(RM) $@
- 	$(LN) $? $@
- 
--includes:: computer.hd
--
- depend:: computer.hd
- 
--clean::
--	$(RM) computer.hd
--
- # computer.u:  $(PUBDICPLUSSRC)/computer.u
- #	$(RM) $@
- #	$(LN) $? $@
-@@ -145,90 +124,50 @@
- 	$(RM) $@
- 	$(LN) $? $@
- 
--includes:: fzk.attr
--
- depend:: fzk.attr
- 
--clean::
--	$(RM) fzk.attr
--
- fzk.con:  $(PUBDICPLUSSRC)/fzk.con
- 	$(RM) $@
- 	$(LN) $? $@
- 
--includes:: fzk.con
--
- depend:: fzk.con
- 
--clean::
--	$(RM) fzk.con
--
- fzk.fzkattr:  $(PUBDICPLUSSRC)/fzk.fzkattr
- 	$(RM) $@
- 	$(LN) $? $@
- 
--includes:: fzk.fzkattr
--
- depend:: fzk.fzkattr
- 
--clean::
--	$(RM) fzk.fzkattr
--
- fzk.jirattr:  $(PUBDICPLUSSRC)/fzk.jirattr
- 	$(RM) $@
- 	$(LN) $? $@
- 
--includes:: fzk.jirattr
--
- depend:: fzk.jirattr
- 
--clean::
--	$(RM) fzk.jirattr
--
- fzk.jircon:  $(PUBDICPLUSSRC)/fzk.jircon
- 	$(RM) $@
- 	$(LN) $? $@
- 
--includes:: fzk.jircon
--
- depend:: fzk.jircon
- 
--clean::
--	$(RM) fzk.jircon
--
- fzk.master:  $(PUBDICPLUSSRC)/fzk.master
- 	$(RM) $@
- 	$(LN) $? $@
- 
--includes:: fzk.master
--
- depend:: fzk.master
- 
--clean::
--	$(RM) fzk.master
--
- fzk.shuutan:  $(PUBDICPLUSSRC)/fzk.shuutan
- 	$(RM) $@
- 	$(LN) $? $@
- 
--includes:: fzk.shuutan
--
- depend:: fzk.shuutan
- 
--clean::
--	$(RM) fzk.shuutan
--
- jinmei.hd:  $(PUBDICPLUSSRC)/jinmei.hd
- 	$(RM) $@
- 	$(LN) $? $@
- 
--includes:: jinmei.hd
--
- depend:: jinmei.hd
- 
--clean::
--	$(RM) jinmei.hd
--
- # jinmei.u:  $(PUBDICPLUSSRC)/jinmei.u
- #	$(RM) $@
- #	$(LN) $? $@
-@@ -244,13 +183,8 @@
- 	$(RM) $@
- 	$(LN) $? $@
- 
--includes:: kihon.hd
--
- depend:: kihon.hd
- 
--clean::
--	$(RM) kihon.hd
--
- # kihon.u:  $(PUBDICPLUSSRC)/kihon.u
- #	$(RM) $@
- #	$(LN) $? $@
-@@ -266,13 +200,8 @@
- 	$(RM) $@
- 	$(LN) $? $@
- 
--includes:: koyuu.hd
--
- depend:: koyuu.hd
- 
--clean::
--	$(RM) koyuu.hd
--
- # koyuu.u:  $(PUBDICPLUSSRC)/koyuu.u
- #	$(RM) $@
- #	$(LN) $? $@
-@@ -288,13 +217,8 @@
- 	$(RM) $@
- 	$(LN) $? $@
- 
--includes:: setsuji.hd
--
- depend:: setsuji.hd
- 
--clean::
--	$(RM) setsuji.hd
--
- # setsuji.u:  $(PUBDICPLUSSRC)/setsuji.u
- #	$(RM) $@
- #	$(LN) $? $@
-@@ -310,35 +234,20 @@
- 	$(RM) $@
- 	$(LN) $? $@
- 
--includes:: special.hd
--
- depend:: special.hd
- 
--clean::
--	$(RM) special.hd
--
- special.u:  $(PUBDICPLUSSRC)/special.u
- 	$(RM) $@
- 	$(LN) $? $@
- 
--includes:: special.u
--
- depend:: special.u
- 
--clean::
--	$(RM) special.u
--
- symbol.hd:  $(PUBDICPLUSSRC)/symbol.hd
- 	$(RM) $@
- 	$(LN) $? $@
- 
--includes:: symbol.hd
--
- depend:: symbol.hd
- 
--clean::
--	$(RM) symbol.hd
--
- # symbol.u:  $(PUBDICPLUSSRC)/symbol.u
- #	$(RM) $@
- #	$(LN) $? $@
-@@ -354,13 +263,8 @@
- 	$(RM) $@
- 	$(LN) $? $@
- 
--includes:: tankan.hd
--
- depend:: tankan.hd
- 
--clean::
--	$(RM) tankan.hd
--
- # tankan.u:  $(PUBDICPLUSSRC)/tankan.u
- #	$(RM) $@
- #	$(LN) $? $@
-@@ -421,16 +325,14 @@
- 	$(RM) $@
- 	$(LN) $? $@
- 
--std.fzk: fzk.master-.c $(FZK_SRC)
--	$(FZK_PP) $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
-+std.fsrc: $(FZK_SRC)
-+	$(FZK_PP) fzk.master-.c > $@
-+
-+full.fsrc: $(FZK_SRC)
-+	$(FZK_PP) -DKANSAI fzk.master-.c > $@
- 
--full.fzk: $(FZK_SRC)
--	$(MAKE) FZK_FLAG=-DKANSAI std.fzk
--	$(MV) std.fzk $@
--
--kougo.fzk: $(FZK_SRC)
--	$(MAKE) FZK_FLAG=-DKOUGO std.fzk
--	$(MV) std.fzk $@
-+kougo.fsrc: $(FZK_SRC)
-+	$(FZK_PP) -DKOUGO fzk.master-.c > $@
- 
- # additional rule from PubdicPlus/Makefile.in : by aono
- pod.o: $(PUBDICPLUSSRC)/pod.c
-@@ -442,7 +344,7 @@
- $(WNNDICS): pod $(PUBDICPLUSSRC)/pubdic.p
- 	./pod $(PUBDICPLUSSRC)/pubdic.p -w -1 -k `basename $@ .u` > $@
- 
--.SUFFIXES: .hd .u .dic .more
-+.SUFFIXES: .hd .u .dic .more .fsrc .fzk
- 
- .u.dic:
- 	cat $*.hd $< | $(ATOD) -p $(VERSION) -P $(VERSION) -h $(HINSI) $@
-@@ -450,7 +352,10 @@
- .hd.more:
- 	$(ATOD) -h $(HINSI) $@ < $<
- 
-+.fsrc.fzk:
-+	egrep -v '^(# |#line |#pragma |$$)' $< | $(ATOF) -h $(HINSI) $@
-+
- $(DIC): $(HINSI)
- 
- clean::
--	$(RM) -f *.fzk *.dic *.more fzk.master-.c pod $(LINKS)
-+	$(RM) -f *.fsrc *.dic *.more fzk.master-.c pod $(LINKS) $(FZKDATA)
diff --git a/app-i18n/freewnn/freewnn-1.1.1_alpha22-r1.ebuild b/app-i18n/freewnn/freewnn-1.1.1_alpha22-r1.ebuild
deleted file mode 100644
index b076cfe87a80..000000000000
--- a/app-i18n/freewnn/freewnn-1.1.1_alpha22-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MY_P="FreeWnn-${PV/_alpha/-a0}"
-
-DESCRIPTION="Network-Extensible Kana-to-Kanji Conversion System"
-HOMEPAGE="http://freewnn.sourceforge.jp/ http://www.freewnn.org/"
-SRC_URI="mirror://sourceforge.jp/${PN}/59257/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="ipv6"
-
-DEPEND="virtual/libcrypt:="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-parallel-build.patch
-	"${FILESDIR}"/${PN}-Wformat-security.patch
-)
-DOCS="ChangeLog* CONTRIBUTORS"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s/WNNOWNER = wnn/WNNOWNER = root/" \
-		-e "s/@INSTPGMFLAGS@//" \
-		makerule.mk.in
-
-	# bug #542534
-	sed -i \
-		-e "s/egrep -v/egrep -av/" \
-		PubdicPlus/Makefile.in \
-		Wnn/pubdicplus/Makefile.in \
-		cWnn/[ct]dic/Makefile.in \
-		kWnn/kdic/Makefile.in
-}
-
-src_configure() {
-	econf \
-		$(use_with ipv6) \
-		--disable-cWnn \
-		--disable-kWnn
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install.man
-	einstalldocs
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-}
diff --git a/app-i18n/freewnn/freewnn-1.1.1_alpha23-r1.ebuild b/app-i18n/freewnn/freewnn-1.1.1_alpha23-r1.ebuild
index 9f5072395f73..9aa3cdbb9b15 100644
--- a/app-i18n/freewnn/freewnn-1.1.1_alpha23-r1.ebuild
+++ b/app-i18n/freewnn/freewnn-1.1.1_alpha23-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/63271/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="ipv6 uum"
 
 RDEPEND="virtual/libcrypt:=
diff --git a/app-i18n/ibus-rime/Manifest b/app-i18n/ibus-rime/Manifest
index d0a3ac8403b5..b2753ab165b2 100644
--- a/app-i18n/ibus-rime/Manifest
+++ b/app-i18n/ibus-rime/Manifest
@@ -1,6 +1,3 @@
-AUX ibus-rime-1.4.0-fno-common.patch 278 BLAKE2B b4ec86e71074309ccacec7299b5c6f5e9eda55af3b1a8e5a8db105833c5482fd10aacf22e03fd61bea75646930b3285c8a2a6b907f54223556cffd3884beebcc SHA512 45fd643cea9695b92eecc76e93a7908967b3eb66a108541ec6733c1a6e145ef43aa81592666db1d811b2460593ac3a0b1432990d387f58c897bfd1360f2a9b80
-DIST ibus-rime-1.4.0.tar.gz 34176 BLAKE2B 69d0392adc78b2b8935f2239c4567d001d3636d0e8ff59aca0b04b3189751a3edd0350eea9e2262b3ae3e639dbd9715c157e44727cc48ba9521801161a1508f4 SHA512 3fc24f4ce390e27d37e41775e4c075c7465cd3e90a9ab61d13ec47c2ca1c2afaafb322f327e18be573aa254a43b8cf6426415500a5d817b835bf4e0615ab9145
 DIST ibus-rime-1.5.0.tar.gz 35170 BLAKE2B 30cba341c3ae29438bf94fd93f030d6aa4fde3988d11b1b5e92aa4190ceac7e0776e07248cb1930819f455b378e01e3305fbf687efc997e675f23ff3120037ad SHA512 59b05efe7d5c7dd6dd88a213f05967b19f4946ad0685e29c6c87fbc47ffb3059cc16c88403cfbb945bcbf8637b20d34dcfd91d442c23bb6a9a18d60febbaf27b
-EBUILD ibus-rime-1.4.0.ebuild 807 BLAKE2B d4c5bb3ff31b04e07c072a1ff44b934d74d56b5dc39726d44dfec7390ae4213c0fc401c0223d4d3b139874d8e0436e01459db877024700871c2a66c817731cc8 SHA512 e1102beae2168d556f306e05b4960a4fd94eefc3978996ba6fdd06d0752268f67d0d006d53adc9e993914e70b97cac9e8c20e7c12ef339ab10155ffca77e657d
 EBUILD ibus-rime-1.5.0.ebuild 688 BLAKE2B d700726025c5b7bc0a511893a48867a8401f76df278933813e5119ff7edc46269fb739bf0b6134a7b87b45325c2cc4623c25caa1cca113e08b1dcfc426de85c3 SHA512 67737e557f02c3dd505097420500af2eb6324e6784faeb9069f7f14abc6fce218fdfaa5d90033aca2e48c366224417803966ebd97c10b06e852071d27a51351b
 MISC metadata.xml 535 BLAKE2B e286452e6309162cc6e537f9068abd5e7ff6a384cdecefdeb7a721caca680c6eac8578cf0d678c3113b900eb863f3aaee01853592968d89c431df271ae3df369 SHA512 95a1fb828e1864aff2c690bbed799b59417a061eef153393d4814892ed3be92713683409b423b46f4e90afa9c677c479011d6adbbc203003ac1a146300611622
diff --git a/app-i18n/ibus-rime/files/ibus-rime-1.4.0-fno-common.patch b/app-i18n/ibus-rime/files/ibus-rime-1.4.0-fno-common.patch
deleted file mode 100644
index f935a18ef8c3..000000000000
--- a/app-i18n/ibus-rime/files/ibus-rime-1.4.0-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/rime_settings.h
-+++ b/rime_settings.h
-@@ -20,7 +20,7 @@ struct IBusRimeSettings {
-   struct ColorSchemeDefinition* color_scheme;
- };
- 
--struct IBusRimeSettings g_ibus_rime_settings;
-+extern struct IBusRimeSettings g_ibus_rime_settings;
- 
- void
- ibus_rime_load_settings();
diff --git a/app-i18n/ibus-rime/ibus-rime-1.4.0.ebuild b/app-i18n/ibus-rime/ibus-rime-1.4.0.ebuild
deleted file mode 100644
index 1a7bb058a4c0..000000000000
--- a/app-i18n/ibus-rime/ibus-rime-1.4.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Chinese Rime Input Method Engine for IBus"
-HOMEPAGE="https://rime.im/ https://github.com/rime/ibus-rime"
-SRC_URI="https://github.com/rime/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	app-i18n/ibus
-	app-i18n/librime
-	app-i18n/rime-data
-	x11-libs/libnotify"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/cmake
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
-
-src_prepare() {
-	sed -i \
-		-e "/^libexecdir/s:/lib:/libexec:" \
-		-e "/^[[:space:]]*PREFIX/s:/usr:${EPREFIX}/usr:" \
-		-e "s/ make/ \$(MAKE)/" Makefile || die
-	sed -i -e "/exec>/s:/usr/lib:${EPREFIX}/usr/libexec:" rime.xml || die
-
-	default
-}
diff --git a/app-i18n/im-chooser/Manifest b/app-i18n/im-chooser/Manifest
index 5f0489dbd1f7..0c692be00a12 100644
--- a/app-i18n/im-chooser/Manifest
+++ b/app-i18n/im-chooser/Manifest
@@ -1,5 +1,3 @@
-DIST im-chooser-1.7.0.tar.bz2 509630 BLAKE2B 4a7706509ceb19c7292a5c8cf80c8fa0b571819403f30f1fa3002927c69a83522b4de627b1d453db0ada8e662da3624edcb5f85eaf01dfa0187978f2a9b2095c SHA512 2a01488062b5a4dc1e4cd0815dda5a6bcef205dc50ed75d58836c5b46e3f86be79aac70eb5d6753e5f569ccc05015dd6d8de59029e94dc407cc613160d3ac61c
 DIST im-chooser-1.7.3.tar.bz2 602217 BLAKE2B d61ad631ff40a25bffef17779b01073062bd70221b7e4ca435b896fc989f9a71036b84a5eb774abd2f42cee218932ccc7511a6056d3aa14d2cb7c262c4b45fe3 SHA512 d43088909e7ba3ad84166965877c4052aad195e360c0583dbc612b46cccd703217b57f149fa584f2f0d3fb706a8bcd6d129c5f9ca407b0a11bb6d304d4a06ef7
-EBUILD im-chooser-1.7.0-r2.ebuild 935 BLAKE2B f696b159972f5f145ef97a0dfc60a08e582e87d40ee7af2d6d96b965d4ccd66c2e186dba6b10c60487d168163b613a602441760b51cea6f77ade8234d36e0252 SHA512 34e016ea178850023e8ad18511e66b621bc69f15570b6f5745c66465e780101e30607eb4b5e17425e66ce0fc48064a30fcc940117b2067e248b8da7563e919ad
 EBUILD im-chooser-1.7.3.ebuild 922 BLAKE2B 4bff9625d562760e6deef89dea611515cfd907312c1f4fdbf7294144ef8174c69416e90ffa92d0c301d5a532817a63f89c052d22ca12c6d9b9f6ad69531894c4 SHA512 d0c01a7ef9f5818a2476e4b3362d5d6b0b7567316061e9fe948510a0635b78854000f1d1dfca8001da67c96604a3219abc5db2a9b85fa63455c8906a424b5ec4
 MISC metadata.xml 492 BLAKE2B 52e0b290e1ff9a3bc27eae91aecdfa145045e5746bddd128ba6fe4a1063f07e33491b3622fe770a58fc52a1fd31864debb811ad50a32b9d30c5f8c7ec3d9df3c SHA512 a2b347f40c28baeaaf7c6375a14723612bdaa3fdc3670b049088681dd18f98d2fbaf56be670f2dba267c5a9e8e9da1e1eb91ac1fafeb54f6530bf490a5e0d6fa
diff --git a/app-i18n/im-chooser/im-chooser-1.7.0-r2.ebuild b/app-i18n/im-chooser/im-chooser-1.7.0-r2.ebuild
deleted file mode 100644
index f493dc5a0002..000000000000
--- a/app-i18n/im-chooser/im-chooser-1.7.0-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit autotools xdg
-
-DESCRIPTION="Desktop Input Method configuration tool"
-HOMEPAGE="https://pagure.io/im-chooser"
-SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="xfce"
-
-RDEPEND="app-i18n/imsettings
-	virtual/libintl
-	x11-libs/gtk+:3
-	x11-libs/libSM
-	xfce? ( xfce-base/libxfce4util )"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-util/intltool
-	sys-devel/autoconf-archive
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i \
-		-e "/PKG_CHECK_MODULES/s/\(libxfce4util-1\.0\)/$(usex xfce '\1' _)/" \
-		-e "/^GNOME_/d" \
-		-e "/^CFLAGS/s/\$WARN_CFLAGS/-Wall -Wmissing-prototypes/" \
-		configure.ac
-	sed -i "s/Applications;//" src/app/${PN}.desktop.in.in
-
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-i18n/im-freewnn/Manifest b/app-i18n/im-freewnn/Manifest
index ec5710d35358..ed64960f5d61 100644
--- a/app-i18n/im-freewnn/Manifest
+++ b/app-i18n/im-freewnn/Manifest
@@ -1,8 +1,6 @@
-AUX im-freewnn-0.0.2-as-needed.patch 905 BLAKE2B 6d3d88b57bb7b2e0fe812e69509a31537eb15f979c9e9530a73b9e5b1d599573895e6716debd2bb6032bafeabfd8afeafbeaa8b0db875c312bc07a044742b6fe SHA512 38472c17123784f2a76d25a2d3accea7aa3e7317b3581e1e86b3ba4d71abdd0fc721d14a2c9f8869ab522185357b25b82a3ebf49ca0d3eb07aa6581278aefa1f
 AUX im-freewnn-gentoo.patch 2426 BLAKE2B cf395d08d18424e182645e06fc14e9c0cf9a2f676b5a9ee67c8d740eb9c7c89eb49e969d84a8c5215318735d6e5c8c34ac377a414dfcdb6db5279b3b81168f67 SHA512 aebad875ff118a7d9b4b3ba2facafcb369527621cfc9be82bb21d07b8eb0d390d46f598f83dc49eddf9de00a9c1d8cef2fe1f550f6c1bf06219ce6be56633655
 AUX im-freewnn-headers.patch 511 BLAKE2B 13ed6574b9a6aa29db8a20c9b2deff0b0374ad298d2a6ed433bc2ad45823e03de46817f64c57c6f1ba5eb7064611e777b11b11b39444b20b23618650a5535814 SHA512 ae209226010483d0b4a4ec10888d29d6b71002bb9457519b83a56cfb958da9e47740530e23baf2f35453f60902b359443f10e331e4a5b96eff386b78f80ad856
 AUX im-freewnn-wnnenvrc.patch 367 BLAKE2B 5225eceff814d61c2f864b5f8316bb0e902eca4c5d606f724a0bf3ad12b3ce0f0a54af28c4112378a47f2fac3028d9d2fca362f40a20d62d95f656130043dc67 SHA512 0a8e506944d537084a6cd6efe7c0e7583781220e38fb17f164ba7b01290bbe59a4db04a95d2d72299dbd5bc2d9ff2af036d00101c6ced1b593a0a20b98531df7
 DIST im-freewnn-0.0.2.tar.gz 322963 BLAKE2B c089688a52c86cc8c0050987a17d294365e29ef33e70258efaad719876d079e997a7255b86a8b23b6c3bb2c779702e6dd8d6eb9825943f9a7034757ac27e5e51 SHA512 c942d320433d0b1ff15fc1566eff183f5761ce14cb0575834f4ee80504be6d286068203c22ffea81345dab3db11a873f0a559b3d38ba8505f4966f9532a06358
-EBUILD im-freewnn-0.0.2-r2.ebuild 881 BLAKE2B 226f8dbe150d109976e31d88dbbb9779ed32681178bf4c36eef103c772656cbb413de6e5efe6e2c1a2c77bd3fa2d70ac49338a6ec005ed9c6bdf825fa9ff8cc6 SHA512 bdd03e3bdf082af8d3440e0e14bbde17480969903810466ed1e5e38686ff6aca28901453a8c845df1c5e238044884ffda124cdf75c07422451c95f3f2c35464d
 EBUILD im-freewnn-0.0.2-r3.ebuild 876 BLAKE2B 2b9bd69de0e222060106eac1b9c48f0fd90d1f3fe9454cb189f5d472b0970a7379ac28e7d0cb4e3647a8b84a16209e24264772f5d73a8f3fdea71a01d4f096d9 SHA512 9742dc688669d610dcf4d9d3ce196dc48e4773bfd7fd149730fac7aee7cc78317c30057b4182c172c9319dd06c997ef2e10915714c53ad722648f531915a80cc
 MISC metadata.xml 241 BLAKE2B d06d8c9218cb9736ecc414504678e9bff30ba6bffbd2b357e9a2ea990df4e73a21b8ad4db267eddfdbf73e8501dabe5a748c4ea9d26906d39425ab744b320216 SHA512 cff6b46a252b531091d1ef597e3f714f98d2ef4aa621662d8c2ec15e4f990cd811300d3439e1be003bd307d0c8d12e78f34cf7fd49f6d006d9362f0e6ccf6252
diff --git a/app-i18n/im-freewnn/files/im-freewnn-0.0.2-as-needed.patch b/app-i18n/im-freewnn/files/im-freewnn-0.0.2-as-needed.patch
deleted file mode 100644
index 859ea779817a..000000000000
--- a/app-i18n/im-freewnn/files/im-freewnn-0.0.2-as-needed.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- im-freewnn-0.0.2.orig/Makefile.am	2004-08-04 07:05:06.000000000 +0200
-+++ im-freewnn-0.0.2/Makefile.am	2009-12-29 20:34:54.420539767 +0100
-@@ -10,8 +10,6 @@
- 
- DEPS =
- 
--LDADDS = @GTK_DEP_LIBS@ -lcrypt
--
- EXTRA_DIST=	\
- 	im-freewnn.spec
- 
-@@ -38,7 +36,7 @@
- 		candwin.h \
- 		candwin.c
- 
--im_freewnn_la_LIBADD = $(LDADDS) -lcrypt
-+im_freewnn_la_LIBADD = @LIBS@ @GTK_DEP_LIBS@ -lcrypt
- 
- module_LTLIBRARIES =				\
- 	im-freewnn.la
---- im-freewnn-0.0.2.orig/configure.in	2004-08-05 08:04:36.000000000 +0200
-+++ im-freewnn-0.0.2/configure.in	2009-12-29 20:36:31.562539161 +0100
-@@ -48,11 +48,8 @@
- AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
- 
- dnl FreeWnn check
--ldflags_backup="$LDFLAGS"
--LDFLAGS="$LDFLAGS -lcrypt"
- AC_CHECK_HEADER(wnn/jlib.h,,)
--AC_CHECK_LIB(wnn, jl_open_lang,,)
--LDFLAGS="$ldflags_backup"
-+AC_CHECK_LIB([wnn], [jl_open_lang], , ,[-lcrypt])
- 
- AC_OUTPUT([
- Makefile
diff --git a/app-i18n/im-freewnn/im-freewnn-0.0.2-r2.ebuild b/app-i18n/im-freewnn/im-freewnn-0.0.2-r2.ebuild
deleted file mode 100644
index 5c5f22692a71..000000000000
--- a/app-i18n/im-freewnn/im-freewnn-0.0.2-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools gnome2-utils prefix
-
-DESCRIPTION="Japanese FreeWnn input method module for GTK+2"
-HOMEPAGE="http://bonobo.gnome.gr.jp/~nakai/immodule/"
-SRC_URI="http://bonobo.gnome.gr.jp/~nakai/immodule/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="app-i18n/freewnn
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-as-needed.patch
-	"${FILESDIR}"/${PN}-headers.patch
-	"${FILESDIR}"/${PN}-wnnenvrc.patch
-)
-
-src_prepare() {
-	default
-	eprefixify ${PN}.c
-
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_query_immodules_gtk2
-}
-
-pkg_postrm() {
-	gnome2_query_immodules_gtk2
-}
diff --git a/app-i18n/imhangul/Manifest b/app-i18n/imhangul/Manifest
index 329c982aaeb5..64e182aa7baf 100644
--- a/app-i18n/imhangul/Manifest
+++ b/app-i18n/imhangul/Manifest
@@ -7,10 +7,8 @@ AUX xinput-imhangul3s 61 BLAKE2B 52bd0edf0939fbb9175da1596d369ab9917d93a09ebfd4c
 AUX xinput-imhangul3y 61 BLAKE2B bc4e3c683e3ddc2f3174ddc7c1be36a8479d4584feef20402d0ed5721338cb7bc4bb0878ff4b890b929e66d4cad073a08955714d5178814b6ae67ed9b869a6f5 SHA512 b5340313cfe8d0ce0405b0cfbdcfde5192ede2cadf7006888526b1b4d98e257abdb276cae4b98b0caf40d5563f4f950e98e2fa0c1432b6efe36c9df11e7a92eb
 AUX xinput-imhangulahn 53 BLAKE2B ed7e3dcf8c5108b833186f1acdaeb34c04d4d6682a3e747f1ce2bafc2e8e98d788610c8372257583e8e5031bd78ca5ef32a013b72fae34a36aca130e808d3e6d SHA512 3ac9858111de532b483c8fb209f2517651e821ecf4aa704118d9f227a9ab090ae85cbb5572e14e6a04dc49b938fdcf103604ab1c2370df257174f94be2de55d9
 AUX xinput-imhangulro 50 BLAKE2B 01b0a4e625348fc9221b2f52d10288befbbf71774e3406005df4365695c1d996643b3369703f9e8ce64d699f88ee616ae2a48fa24f0c648bf2bc28a9625a84fd SHA512 5d1f588fcda77e6d96cfa955f0057edf614fe01290c9541eae61f8be85a7da80a29246bd2c777f517ce544c094a01d13d73d91368be7296aae9639698add90c4
-DIST imhangul-2.1.0.tar.bz2 268205 BLAKE2B c45cc3e0919c695466f7d09c20c3ee5ae827865b6c3093746f8435bfb3f18da0cf94bc4225829dbafb2f13fcd1da0ec4a696adb966bff90285c769eb36232c4b SHA512 ea4621c4e0e5ed1786e644b577bc0c9f3dbbf296f938ddb2ab04923d8147e01123e10e09a61484e30c3ab0ff51d86da80a93bce583eceee207eab90c27df5f8e
 DIST imhangul-2.1.1.tar.bz2 288452 BLAKE2B 14aba1fb582edd735d1469b2fc1c4b576c64f073f525b30a3c5dd681b82d07f7b2960a63c388dae47d93855f25abbfbb2a48b032e5509239325db1cd05ff6b5e SHA512 5db3843aec698bd6315e4c76f3d8ea374b5d985ff7ae8a3d05861afb1d564ffe274d56fa27e8f669884016c50d5fc1850984050d93fdee944c6f7c3c963c96f1
 DIST imhangul-3.1.1.tar.bz2 288236 BLAKE2B bb762481c98d8e4d3e1f32629802320fbdd6ec2388e9d7e9f1838fbbcb05f247549dc2baa68e6f4ec626f32b1911b5dfa89810e64c9e826cb1887400bbe11e71 SHA512 a27fb34a826ceccb16e4c8a422f5571c7c6a4c253cd2a55c1025b0c22500a380a35a8703e9f0f6300fdc92544e1d7b59e33f11e059b85754b1619698e0f74d89
-EBUILD imhangul-2.1.0-r1.ebuild 1316 BLAKE2B 69126f747d8bfb63a7a84bb709c670d9c367334ac6b7878540793e1e6609887e3b80d2bcb07cbd2029b420113d4f485dc952d17165b9adf5aceddff222e5d01f SHA512 b15817264f7f780ef0bd952cd86a4b36038d10b96bc3e093bc05af8c4a5752b56688d6f9a2efac33dcd3ae45fea551707fadf092a8dcb063fb0a620d92517859
-EBUILD imhangul-2.1.1.ebuild 1317 BLAKE2B a1e3802433337550753bbd0abde56cac4ccab1ac7514f4df92ac229d72f7c39c84dbbe6728bea7ccd9f4eb14012d5622270cb4a92f35ca9aa005caca89925743 SHA512 716cdce45f14680cbb907ac236fcfdaccaa4ca1bfdf63df63995cbb18a3622c8d4068adc1829523d4b7b98804e0a93eaeb3c46338f8315f6792b435e0d0a3969
+EBUILD imhangul-2.1.1.ebuild 1316 BLAKE2B e4ddde8e5452eeba92b682b2d000d312e671322e6ddf98a59b2673f37cb63b66353703b8d68a2a04e3d590281bd8d27899a5c583c79c4438abe3476533e0720c SHA512 26f6e6f220679c5401b569003babe469bb1652ba6724b5d134a31cde0cd936f660b3fd5cff1cfd06cce5e0c4f3ca8c919434408a8204c47cbe98276e072920fc
 EBUILD imhangul-3.1.1.ebuild 1319 BLAKE2B 6f6ada7d0d9fa00447fbec8012178f0d6317bb4ba93786f29a5248d3df9af02bc4c709886f2b4fb63e2c9082df0fff7c57a205e959c81632c9c51502ac175320 SHA512 adf94976d571b323fafa899f89285a67a6eb7d69e59094c2336c49b9315530154232488d07ef9c64c3feb9ade5d703af43477393ef05e23df6098a2709ff758d
 MISC metadata.xml 371 BLAKE2B 148a59790be39b85be7f7c4c39b36b315535b69e4823835432bbf74513dbfcddf3e0c9ba79567e8cefc7345304331fbc2b7ef1d9ca476f7e4bd6eaa23ef15cd6 SHA512 528d7a1d0dccc30577ea7029da878fe8ebe896371990ecd394643b29aa51287a666659a32d4c30dd34c0d153ea9efe73514c664b35e00ef8684ed5eefddefe00
diff --git a/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild b/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild
deleted file mode 100644
index 22f7c57fe635..000000000000
--- a/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit gnome2-utils toolchain-funcs
-
-DESCRIPTION="GTK+ 2 Hangul Input Modules"
-HOMEPAGE="https://github.com/libhangul/imhangul"
-SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="app-i18n/libhangul
-	x11-libs/gtk+:2
-	virtual/libintl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_prepare() {
-	default
-	gnome2_environment_reset
-	gnome2_disable_deprecation_warning
-}
-
-src_configure() {
-	econf --with-gtk-im-module-dir="${EPREFIX}"/usr/$(get_libdir)/gtk-2.0/$($(tc-getPKG_CONFIG) gtk+-2.0 --variable=gtk_binary_version)/immodules
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-	dodoc ${PN}.conf
-
-	local s
-	insinto /etc/X11/xinit/xinput.d
-	for s in 2{,y} 3{2,9,f,s,y} ahn ro; do
-		newins "${FILESDIR}"/xinput-${PN}${s} ${PN}${s}.conf
-	done
-}
-
-pkg_postinst() {
-	gnome2_query_immodules_gtk2
-	elog
-	elog "If you want to use one of the module as a default input method, "
-	elog
-	elog "export GTK_IM_MODULE=hangul2  # 2 input type"
-	elog "export GTK_IM_MODULE=hangul3f # 3 input type"
-	elog
-}
-
-pkg_postrm() {
-	gnome2_query_immodules_gtk2
-}
diff --git a/app-i18n/imhangul/imhangul-2.1.1.ebuild b/app-i18n/imhangul/imhangul-2.1.1.ebuild
index 8e0c53b3b25c..7c57a544fa3b 100644
--- a/app-i18n/imhangul/imhangul-2.1.1.ebuild
+++ b/app-i18n/imhangul/imhangul-2.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.go
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="app-i18n/libhangul
diff --git a/app-i18n/imsettings/Manifest b/app-i18n/imsettings/Manifest
index 61027bb18486..d8878aaa93a4 100644
--- a/app-i18n/imsettings/Manifest
+++ b/app-i18n/imsettings/Manifest
@@ -1,6 +1,4 @@
 AUX imsettings-fno-common.patch 334 BLAKE2B e4ca9b361b2559e808e40db759a2418a5f757e482eb10b2c0fd4ec73b1781eda29982427ec71bf11b4574ff862df4d2c18e01d672e9b5c656aac54e0b67ba4bb SHA512 c3c6445182934b7822f71085f27279b918e16c79f02cec6e3ece3133d891bb3a7aca09c3adc675aabfce34a0ab2e8e7f61eba47b5e76da70ceee0a8f1f86ca69
-DIST imsettings-1.7.2.tar.bz2 595754 BLAKE2B 9964ab7ca842a7e1b9e9c61434275b55d6a58e271dd12058195573aa65c623d5152a04bc893b3ac4d983c4798bd6f4e8cdb486577be45ec43db6600f72c8cc3b SHA512 b28d67705d3d6a0ec95babaca616f750b73cdac5e01ed61e25a6527fd7f816a14654cd7233eca56d7427b9395e7ad75757b95cd7bd55c56bbdc145a3f8bfe1f0
 DIST imsettings-1.8.2.tar.bz2 705391 BLAKE2B 3b7f3e2ca2c08bc149be95fb97889ab58fc22be828b9801f4c342c1514a7be35644548d6a920fe657e1d85a9d35d8c2a40766f25d6420bb3da8a8f4e7a7ba739 SHA512 600315a20fd61eaa77a0add1e587861ad3ce70175d87639e43105d804cec59bfbc0219f2177c4d9e07d337231eb85514cbfd8af614a113b688ead372075b9ff4
-EBUILD imsettings-1.7.2.ebuild 1662 BLAKE2B c9b2942533d904a6a40c771dfb5ad5c72eb06c3c94acd1eeef1eff52839501949391d8a7081d56983bdecd146124f8e256885fa7d91da8ff6e5abb601fea0469 SHA512 3c4df3f5aa61dff767b8b1b660b045c011d37cbd332641b1f0e78cca58655273bec9f9f0c8f90a19faec129e187286f446e66c1e7c6eb2d80a5e6f2aa984bf68
 EBUILD imsettings-1.8.2.ebuild 1643 BLAKE2B 52375b27b45d44e2ab866e211abc6a3f4e23297ce9e1d231b88a64a3a0d5ebad6c072fde8ba064866b938aa46ac5791d1950b2c60bf113987f48ac889479d7e0 SHA512 3c3fcdfad95b7c60107c90fe2ec43c81741d9bdbcfa2c1a83743b20bf2810056fb71cc250c93db0a5acd5280604b0ad583dfd8507159521a28aafb91fbf53650
 MISC metadata.xml 485 BLAKE2B d88d782384ac82e2fdd3c73821019b2293e27c6883036daa3c4e9477e81b7f82ec7dc47ee779c376ac8462d032a445dd6682a53330ac4acaebb3ec9f94affe6e SHA512 c9d7943e08fded57aa9d13538bd2daca3afe393831f113cf56a7cfda9f4b16324553f029f483cf3c6f1b54827423cd5171bea94d9638046a90f15a2170ab058f
diff --git a/app-i18n/imsettings/imsettings-1.7.2.ebuild b/app-i18n/imsettings/imsettings-1.7.2.ebuild
deleted file mode 100644
index bd16d48dc80e..000000000000
--- a/app-i18n/imsettings/imsettings-1.7.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit autotools
-
-DESCRIPTION="Delivery framework for general Input Method configuration"
-HOMEPAGE="https://tagoh.bitbucket.io/imsettings"
-SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="gconf qt5 +introspection xfconf"
-RESTRICT="test"
-
-RDEPEND="dev-libs/glib:2
-	sys-apps/dbus
-	virtual/libintl
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libgxim
-	x11-libs/libnotify
-	gconf? ( gnome-base/gconf )
-	introspection? ( dev-libs/gobject-introspection )
-	xfconf? ( xfce-base/xfconf )"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-util/glib-utils
-	dev-util/intltool
-	sys-devel/autoconf-archive
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-fno-common.patch )
-
-MY_XINPUTSH="90-xinput"
-
-src_prepare() {
-	sed -i \
-		-e "/PKG_CHECK_MODULES/s/\(gconf-2\.0\)/$(usex gconf '\1' _)/" \
-		-e "/PKG_CHECK_MODULES/s/\(gtk+-2\.0\)/_/" \
-		-e "/PKG_CHECK_MODULES/s/\(check\)/_/" \
-		-e "/PKG_CHECK_MODULES/s/\(libxfconf-0\)/$(usex xfconf '\1' _)/" \
-		-e "s/use_qt=\"yes\"/use_qt=\"$(usex qt5)\"/" \
-		-e "/^GNOME_/d" \
-		-e "/^CFLAGS/s/\$WARN_CFLAGS/-Wall -Wmissing-prototypes/" \
-		configure.ac
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		--with-xinputsh=${MY_XINPUTSH}
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	fperms 0755 /etc/X11/xinit/xinitrc.d/${MY_XINPUTSH}
-}
-
-pkg_postinst() {
-	if [[ ! -e "${EPREFIX}"/etc/X11/xinit/xinputrc ]]; then
-		ln -sf xinput.d/xcompose.conf "${EPREFIX}"/etc/X11/xinit/xinputrc
-	fi
-}
diff --git a/app-i18n/kakasi/Manifest b/app-i18n/kakasi/Manifest
index f7d5d0e1c868..55ecfcfc37ef 100644
--- a/app-i18n/kakasi/Manifest
+++ b/app-i18n/kakasi/Manifest
@@ -1,5 +1,3 @@
-DIST kakasi-2.3.4.tar.gz 1099258 BLAKE2B e3644e8688082df393ab3b1dc356b682b3ea4a66c46d33c3e3c65ffd882a357600ec99f017e72bea491ad7779cbbaa044479101322a14baccc5385edc20a7b22 SHA512 33fa17251ba00163f6d9df208f18c88ff2dfa9891320f1d00fc0c72686bbcc59cf3ccbfb76fa66dfb135a6e942ef4d5d907edc3f1ca9d380c5b7a7d4df090a66
 DIST kakasi-2.3.6.tar.gz 1352154 BLAKE2B 2e23c5e83aefc040567d0a945b98c52a1123fe41383ded90a2e2a0cea5a9ee0e8d1f4560cb1d5959df5253702eaa958d3522791ef16235aa07dcc2beb2fe008c SHA512 212dbf4125db343b5d8ab5849fd85cbc1060c259eb1a37593817a990104ce53c146e0ba8e79c7f7427d1eb59b0d7d6c3d7f9e2cb8e303cff3088a030f1b0327a
-EBUILD kakasi-2.3.4-r2.ebuild 809 BLAKE2B c81a2afc86bc72f50da691f618f1dc3a6ba2c2222e9233b1e4115de86dd04280d5173219edbb1448d786b82aa3c7ca6bf35d91b2fb5294a5342572b5ed5648be SHA512 48f64f60ba0448b9da67a42a6a04074b046ab024cddbdd4d772abead2845f15dba79b6e55d4cde6102ec80f56bbff8265a9ae707e765e7baa005159d28c42352
-EBUILD kakasi-2.3.6.ebuild 781 BLAKE2B 8bfd27cae8903232f1322615a1e314bb34d2a400251261b582d3fe1d80016fedfbcea2e28d612a28a68b0cddd2b7ba1400d950821327ae8e9d353fd058376e00 SHA512 a297042bb61bb07b62cf2a6f2658b0855ef168b9dee0f5f427facfd95e23115852847515a5ad3cb989d3efeb9fd7065141a4a990fddfdabe66d67e1d79fadec1
+EBUILD kakasi-2.3.6.ebuild 780 BLAKE2B 733be03e501b50d44a08142082f4568b517e0ed7c735fb5ff135716560f748185019e54b0a6518d057c2e8e4003597442237d359e2e819d5bb00a8d4a01a89dd SHA512 3ed2c49893ed8c292a4a867838673db9501b1bae7ef05028d1ed6e11d76159a27b716ca32029098cead68fda58f03ab839106b861dab7054b680374ddcb64f87
 MISC metadata.xml 235 BLAKE2B a3e5a3109b59e3f97ef14f8d55ba13b16dc5371a1b7d6f238230aa4494db32dd4a42e3ee012ec8b18fae394feb2b1b56882bc70504aa7c6b969c1b20140f0ece SHA512 7c4e5f5dea465e45c662f5f53513626088aff514e1326593426af227d77e63d8a00d8af05aa208881a399f83dd41e73cd2ef81c8b7f275a2fa891f295231d67c
diff --git a/app-i18n/kakasi/kakasi-2.3.4-r2.ebuild b/app-i18n/kakasi/kakasi-2.3.4-r2.ebuild
deleted file mode 100644
index b69e70b53497..000000000000
--- a/app-i18n/kakasi/kakasi-2.3.4-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Converts Japanese text between kanji, kana, and romaji"
-HOMEPAGE="http://kakasi.namazu.org/"
-SRC_URI="http://${PN}.namazu.org/stable/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="static-libs"
-
-DOCS=( AUTHORS ChangeLog {,O}NEWS README{,-ja} THANKS TODO doc/{ChangeLog.lib,JISYO,README.lib} )
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	default
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-	use static-libs || find "${ED}" -name '*.a' -delete || die
-
-	iconv -f EUC-JP -t UTF-8 doc/${PN}.1 > doc/${PN}.ja.1
-	doman doc/${PN}.ja.1
-}
diff --git a/app-i18n/kakasi/kakasi-2.3.6.ebuild b/app-i18n/kakasi/kakasi-2.3.6.ebuild
index 050ffd49941f..d7894efeacfb 100644
--- a/app-i18n/kakasi/kakasi-2.3.6.ebuild
+++ b/app-i18n/kakasi/kakasi-2.3.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://${PN}.namazu.org/stable/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="l10n_ja static-libs"
 
 DOCS=( AUTHORS ChangeLog {,O}NEWS README{,-ja} THANKS TODO doc/{ChangeLog.lib,JISYO,README.lib} )
diff --git a/app-i18n/libpinyin/Manifest b/app-i18n/libpinyin/Manifest
index 25304f05e3e1..f6385e30713a 100644
--- a/app-i18n/libpinyin/Manifest
+++ b/app-i18n/libpinyin/Manifest
@@ -1,8 +1,5 @@
-DIST libpinyin-2.3.0.tar.gz 256549 BLAKE2B 621176ab14dfe8fb3c32e3ae0b727b8070b5fdcc3a79f8f3c646538151601c7fefe0b2778a54c50faabaf3026d9c029eaa52a0e04144d37f347ca571fd532908 SHA512 5cfe2d70c15dc532fa970a28b70da403f2d848747501bdbdf43c481f8165d6290cb1de086d2ef7af653edfe3fb164d4e8d9cf655302e2aa759709e6031b117b2
 DIST libpinyin-2.6.2.tar.gz 260101 BLAKE2B 7ba61c5bfe68991866112bbb63383bd7062164f92d63150b42c30f39d383f62a339a13eafa1596d1988d8e308c93ccc0f45cceeb557ce329788da507eed3e2ab SHA512 839907bed9bc796185fbe7d7b30ab84bc9bd45212797c75081475791aa62ad3465509ecc5fabe6ea27d02be9d2ca61764a472684b011b0c211bd5f4f26a0f9ca
-DIST libpinyin-model17.text.tar.gz 20278815 BLAKE2B d02a587ab29e1115843d8c2318ef70cf7c2318d5c60ef8135860c611935285fa0f061a21d7e85dd87f6efe957742e21e34a77a7b245b58945cdd478759b0e19f SHA512 d0bf8d476a63e33e292046754161316f00bfea71ebd06fca85b3845fe535431f01458282f505380cae018050aa6a08b14a7bc0684ba372dc79ee14391f47e8a1
 DIST libpinyin-model19.text.tar.gz 20279012 BLAKE2B d8721d106235ef6fb99ad8dd4f4911bb23bf66f0259b01c39fd8ee829f0a63f326894802d62e51531a10f453dff1f4bb6e3e1648cf4aeac8213dccd10fc8ca4d SHA512 93c70423ba14faa3402bce775f82769dd4ee3a49083beddc540825f88facbd847328e9d01d99473adb7cf26de0f853e2b2e14fe849b1c49531134d1ca4ed2ef2
-EBUILD libpinyin-2.3.0.ebuild 1396 BLAKE2B 572d949e4718597eb9de387f1f0d3b3c0f00612b94ce59afef40ab5c8f1baa5c0e48f8b4b37b620b97014004ac67691bfcb267f45d7c8b0cd22c7b47dd10ab2e SHA512 8fac54ea183a925e861589c752279527e74ec7a4614c5a4227458aa1f0986f70ee412fd9797d6bf1ef275d8d2cdf9266a3ffc3a775cad2bbe5c1bba503aa2e4e
-EBUILD libpinyin-2.6.2.ebuild 1395 BLAKE2B daafb3bb728523e606980bc80a1154fa44e65bc96cf478ea142096f2953a3dbf4126c8a3746fdf3380f8bdceea0c3742169e59aca470410bd0b68e22f5a3fac7 SHA512 6d627832722d9c68216b0b2207044c0b1d03d237dcf88ae712c68688d85145d34efd255df766ea2324eed1b5816e378aa0894459ca34d5298ff480f65fccf545
+EBUILD libpinyin-2.6.2.ebuild 1394 BLAKE2B c6c676e9de3a5465684644f2d8af146a961337b7663aa80685f5105715b0ed4c8fa7af742589e141116eee613cc8ea07323d48041ab20851ed9dbce157fdcc66 SHA512 0a10be6e75cda5df7dc878daabeca4d8448f720e693139f9ba85ab48fcb3d4e3326e42b453d0158f006af76e7acbd43cf2057d1cf1ea1388db9160b0491e962c
 EBUILD libpinyin-9999.ebuild 1371 BLAKE2B 387ed25199ff3c1d8e38ac48a270266e238b40caeb67a54517ba4106b031874efe9fd1775d1b0fc82eb8ba3bc4af773e41d0ffaed51d1082aa530ebb775d57aa SHA512 7d9a872d32124a3541643a04ecaff43d5a6215dce70aadf95f3e5d775dcb690be73ae2bda40baf17c75b2c9097ecc546206847234b4061ddb4f2595f5e4e60ef
 MISC metadata.xml 521 BLAKE2B 829486b393163e4b4ac78807b37a57199f3fd07e94db186ba5a067b8a641412d8d83b95c56a4e0a56295b3c74f10277f1f4aa1a8be908596cb1252e13123341e SHA512 d93c02e8293534ca8a627e0504e5a0d69bd0c4b45b9395331183a35f4f4c81b267b80eb10d0c81a64628277e4770002e61c27e28c50fe84a6c390c473b73f41e
diff --git a/app-i18n/libpinyin/libpinyin-2.3.0.ebuild b/app-i18n/libpinyin/libpinyin-2.3.0.ebuild
deleted file mode 100644
index b3d35eeb3f25..000000000000
--- a/app-i18n/libpinyin/libpinyin-2.3.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2012-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/libpinyin/libpinyin"
-fi
-
-LIBPINYIN_MODEL_VERSION="17"
-
-DESCRIPTION="Libraries for handling of Hanyu Pinyin and Zhuyin Fuhao"
-HOMEPAGE="https://github.com/libpinyin/libpinyin https://sourceforge.net/projects/libpinyin/"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-SRC_URI+=" mirror://sourceforge/${PN}/models/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz -> ${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0/13"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
-IUSE=""
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="dev-libs/glib:2
-	sys-libs/db:="
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	if [[ "${PV}" == "9999" ]]; then
-		git-r3_src_unpack
-	else
-		unpack ${P}.tar.gz
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -e "/^\twget .*\/model${LIBPINYIN_MODEL_VERSION}\.text\.tar\.gz$/d" -i data/Makefile.am || die
-	ln -s "${DISTDIR}/${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" "data/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-libzhuyin \
-		--disable-static
-}
-
-src_install() {
-	default
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/app-i18n/libpinyin/libpinyin-2.6.2.ebuild b/app-i18n/libpinyin/libpinyin-2.6.2.ebuild
index 0bc2396c8b15..d58313fa9eca 100644
--- a/app-i18n/libpinyin/libpinyin-2.6.2.ebuild
+++ b/app-i18n/libpinyin/libpinyin-2.6.2.ebuild
@@ -24,7 +24,7 @@ SRC_URI+=" mirror://sourceforge/${PN}/models/model${LIBPINYIN_MODEL_VERSION}.tex
 
 LICENSE="GPL-3+"
 SLOT="0/13"
-KEYWORDS="amd64 ~arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
 IUSE=""
 
 BDEPEND="virtual/pkgconfig"
diff --git a/app-i18n/libskk/Manifest b/app-i18n/libskk/Manifest
index 8b0eebd118fd..ea5a1c5573e3 100644
--- a/app-i18n/libskk/Manifest
+++ b/app-i18n/libskk/Manifest
@@ -1,5 +1,3 @@
-DIST libskk-1.0.5.tar.xz 564488 BLAKE2B e7108bd2f44e5a0a0756cd25da4b07376b36604d6d2159b283e8a5f4ef76006210ff993d58b653cbce01ae4c9e003acf4acbd93ebc40711fec2600e514c49e9f SHA512 6db675edba89b83da0c29afb42644c39bcb0ccfc47f067a18e0eda817df4f58a86c86e8747080018c132d8734754a6fd8a30fe6578050eb93ff636edeed534ab
 DIST libskk-1.0.5_p20210830.tar.gz 190676 BLAKE2B 6b9f058669929efb292692b5047084e2e95e2003a9ecd093205b198bf201249811f672d74e8ee283e6b1f5a94b6a72c79dddb12c950ffe6958ca6aef3aaea5d9 SHA512 2a34111627a43de2d854e2236fd69ec5577b162b097b6e964b891cf09eafaed0d9c3f657bcb1f78ec985a3e2adbed079d37e5e873d1ec35e5f7c66960135ee2b
-EBUILD libskk-1.0.5.ebuild 1016 BLAKE2B 2806873aca5f24aaa5e0bf666e73aab9566ef50abf51d4b7c9c6f450f940be3241510b066c262ad4e573c7b9ec4b5d47962bc5250197e68ac40cb27d63f72ccc SHA512 3beeb39d0f1d228a9896d71f7f322fc5775e563fcffc7064d3465295768c713c804c96cf7b0ba460842bae723dbda5dd1c55f8ee9c9003e21be41d0e362cc842
 EBUILD libskk-1.0.5_p20210830.ebuild 1117 BLAKE2B ff4cef43f1462746b76e0e2bc53ebb4f73ccce88886cd8170ad2c800c65197662df201fd3c071badfca74a2980222259c8642a415399048d5381785d3d3beaea SHA512 f79e362532f4aea561580a8426407bc8ee0fb81576488b02928a5fc2f11e75cc6989bb15c5df83aaf70c7b896279383a5c90cbf35af690faa93e2514bb568b4d
 MISC metadata.xml 311 BLAKE2B c3d3e6eec52aafdd92e37f4fdc850b22d5bc13ca6adf24954f53d13f67d7acaa60a2e8fc74627c442617ec860ba02b614195a49f48551c937addda7b3732c44d SHA512 72e6be18642179d25f2eac33df667891cee4d571ffaf49f823fb31e2605cec2e8dac3b07e9aadc6080fccf96f09f8677421ee71dec0af8ae7178bca1991ffda7
diff --git a/app-i18n/libskk/libskk-1.0.5.ebuild b/app-i18n/libskk/libskk-1.0.5.ebuild
deleted file mode 100644
index 3d761d619f7c..000000000000
--- a/app-i18n/libskk/libskk-1.0.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit vala virtualx
-
-DESCRIPTION="GObject-based library to deal with Japanese kana-to-kanji conversion method"
-HOMEPAGE="https://github.com/ueno/libskk"
-SRC_URI="https://github.com/ueno/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+introspection nls static-libs"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libgee:0.8
-	x11-libs/libxkbcommon
-	introspection? ( dev-libs/gobject-introspection )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="$(vala_depend)
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	vala_src_prepare
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable introspection) \
-		$(use_enable nls) \
-		$(use_enable static-libs static)
-}
-
-src_test() {
-	export GSETTINGS_BACKEND="memory"
-	virtx emake check
-}
-
-src_install() {
-	default
-	use static-libs || find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-i18n/nkf/Manifest b/app-i18n/nkf/Manifest
index 56c8364eb576..7a0c03d7d682 100644
--- a/app-i18n/nkf/Manifest
+++ b/app-i18n/nkf/Manifest
@@ -1,9 +1,5 @@
-AUX nkf-2.1.4-test.patch 145 BLAKE2B 8e8fc2069b8f2fc039cd4bb791c90f37eeb17d26289ca485998530c7ae400e1d4b4ad5d188a2550b42881ff1e85000c0c80034ecc8642f8a53ca1c9d8f029d8c SHA512 c5086a135667440ac289079f401ccf674110db88d0c170652caf9ad5ad341513737c42cf01481b468fbcbf612f250cd0fa5c734a625c66cfdd5702a295707efc
 AUX nkf-python.patch 285 BLAKE2B 439d4009b56cd6469fc7d717b91bf0b89fcbf275d87081359eeb7ade447c76261465703ba33836b9d9a87b4da482dd9cea8bdd46818a43a0b27eb4e7182ae371 SHA512 4c9bc8468656ffb09033f6564775686e1bc2bc99c8e4856c7f38de87b4c3c842bdf6798924ea97a5da2b1b697d7aaca62556c836d122dd496e278b223c3d48f3
-DIST nkf-2.1.4.tar.gz 232479 BLAKE2B 81887b8b0422e92b2fa2be285c1d9fa4da16d572ca50e1fbeef7be4f50af9ba9b64ef140163e325e57c351dd384ee8b09849bad7c37b03d48a9cb4b88f2ee199 SHA512 8667c20a6c5e9c0c6df7ebe2571bcf24090f04dafd306d32f07312acd659ea026a91d31521b4b213f77aba8218159effd73607d0b7236b7287e4a4cde8cc62b9
 DIST nkf-2.1.5.tar.gz 215879 BLAKE2B b5ae8f51b0ed97261f9e82ad469adbc9e469e709dc5acb64bfba48881555931eade5fcb772e7956a7401399008ec33bd57c8d6d8b5790eefe4d69d4e1dabed7c SHA512 fa5b683184481b25249872e7902033a72b6a6219b4c63d508a738710029430733e78cfa13b3d69dc281676762765e0452c92244a3855d3acbb5e23aa63214847
-DIST python-nkf-0.2.0_p20141211.tar.gz 187761 BLAKE2B b607e155934dd14ad4d29298f209a233d846122299326df48e45339661d1cd08a789f5278928cb4a32c747673723f5f8877d98c7a6200af6b2dbbf29cd100f00 SHA512 5a493f32244e3cb72d188fa39b810baef31ce5f530309797a05474e3f58cf22fd5f8b6c66cdf5268451c49ffb759c476c707329ce1ccf42da0362ad4f5c24d71
 DIST python-nkf-0.2.0_p20191121.tar.gz 188496 BLAKE2B f7c9baaff8129956b7981011634f7ee5ece97e1b6650551a5cc2b50ff51a0c96a454f39e888c80120242a12b202c0422c0ecfc21858b1822a4959ff4c108b10d SHA512 ae1494ebdd488dc40802178a1b7b05c9a9b0bcf9cf9fa5017c6bc9f153c01b475c00f993489a21f643acc4ad61595c38c5afe28f3512a4d24f36eda7abd33958
-EBUILD nkf-2.1.4.ebuild 2241 BLAKE2B 20a141326d09ba79845694c66549143a4cea176004f6ec7f7945f46f0c385ba2b116437ec0b4c77a1b8f426f739a84cdee8ee1f203ab50fe0ab255ab6f6fd55f SHA512 6db3a38566cc3134213ea55c4353f4e4f62c4a6007fe1ca0cfbf7f77e2da8ecfcdd8322d847c9f6fb04bb6b5e533df61f991102f460ffd7fd9c5dc6cac8416d7
 EBUILD nkf-2.1.5.ebuild 2316 BLAKE2B b8e984fd5e3e58825a3cb3e7bb85b108c6b1b9c6065f1a708de96d9cd4298ee1384be2ea9a3b90910f4b15221b7805f7ca40cf460c3e2b49d818de4825ead53b SHA512 1e01b532207ad235645d573d052dc9d3f3a556c9d5f68822aa8ee37d6da314a55868c0d52907933a15652156562fa69fd66f947eb1d79b0f0a92e65a4d1c853e
 MISC metadata.xml 301 BLAKE2B 708b7eeb753f365dcb021d159c3a7c56117081ae8a4130978702c7e0c9208ed9ba51c88343b7d94371b0ae6c13685e1844583d42cf4727a24308d3c8b02cc7a4 SHA512 0bd4bdcbda3457e0a8722f39fe32f20f5a9450f3d5181c83fa872fbdf9b478f895523e7a7f4992434d01c0e3a3386585181c90a525a7b080b2d7fac35fce04cb
diff --git a/app-i18n/nkf/files/nkf-2.1.4-test.patch b/app-i18n/nkf/files/nkf-2.1.4-test.patch
deleted file mode 100644
index 26964ef4d64b..000000000000
--- a/app-i18n/nkf/files/nkf-2.1.4-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/test.pl
-+++ b/test.pl
-@@ -120,7 +120,7 @@
-     return;
- }
- 
--do "nkf_test.pl";
-+do "./nkf_test.pl";
- unlink "nkf.in";
- unlink "nkf.out";
- 
diff --git a/app-i18n/nkf/nkf-2.1.4.ebuild b/app-i18n/nkf/nkf-2.1.4.ebuild
deleted file mode 100644
index ac04c630c7d8..000000000000
--- a/app-i18n/nkf/nkf-2.1.4.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_OPTIONAL="1"
-
-inherit distutils-r1 perl-module toolchain-funcs vcs-snapshot
-
-PY_P="python-${PN}-0.2.0_p20141211"
-PY_COMMIT="000915e115acac57a1fdbceb1e6361788af83a3d"
-
-DESCRIPTION="Network Kanji code conversion Filter with UTF-8/16 support"
-HOMEPAGE="https://osdn.net/projects/nkf/"
-SRC_URI="mirror://sourceforge.jp/${PN}/64158/${P}.tar.gz
-	python? ( https://github.com/fumiyas/python-${PN}/archive/${PY_COMMIT}.tar.gz -> ${PY_P}.tar.gz )"
-
-LICENSE="ZLIB python? ( BSD )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="perl python l10n_ja"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-	)"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-test.patch )
-
-src_unpack() {
-	use python && vcs-snapshot_src_unpack || default
-}
-
-src_prepare() {
-	sed -i \
-		-e "/^CFLAGS/{ s/-g -O2//; s/=/+=/; }" \
-		-e "/ -o ${PN}/s/\(-o \)/\$(LDFLAGS) \1/" \
-		Makefile
-	if use python; then
-		mv "${WORKDIR}"/${PY_P} NKF.python || die
-		eapply "${FILESDIR}"/${PN}-python.patch
-		cd NKF.python
-		distutils-r1_src_prepare
-		cd - >/dev/null
-	fi
-
-	default
-}
-
-src_configure() {
-	default
-	if use perl; then
-		cd NKF.mod
-		perl-module_src_configure
-		cd - >/dev/null
-	fi
-	if use python; then
-		cd NKF.python
-		distutils-r1_src_configure
-		cd - >/dev/null
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-	if use perl; then
-		cd NKF.mod
-		perl-module_src_compile
-		cd - >/dev/null
-	fi
-	if use python; then
-		cd NKF.python
-		distutils-r1_src_compile
-		cd - >/dev/null
-	fi
-}
-
-src_test() {
-	default
-	if use perl; then
-		cd NKF.mod
-		perl-module_src_test
-		cd - >/dev/null
-	fi
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-
-	if use l10n_ja; then
-		iconv -f ISO-2022-JP-3 -t UTF-8 ${PN}.1j > ${PN}.ja.1 || die
-		doman ${PN}.ja.1
-	fi
-	dodoc ${PN}.doc
-
-	if use perl; then
-		cd NKF.mod
-		docinto perl
-		perl-module_src_install
-		cd - >/dev/null
-	fi
-	if use python; then
-		cd NKF.python
-		docinto python
-		DOCS= distutils-r1_src_install
-		dodoc CHANGES README.md
-		cd - >/dev/null
-	fi
-}
diff --git a/app-i18n/opencc/Manifest b/app-i18n/opencc/Manifest
index d9457baf4be3..7b1bbcc54de1 100644
--- a/app-i18n/opencc/Manifest
+++ b/app-i18n/opencc/Manifest
@@ -1,6 +1,4 @@
-DIST opencc-1.1.3.tar.gz 2805430 BLAKE2B 060ca820676a92ddfddc362488031e1ada538626a1fbeb8d178a0ef059b99f606cb0f1151857579221942183820bf34c6f96517d13d4ae8dc3f81846537b668d SHA512 90da656fa4790c58932ad2240a076cc4a9e8cf70ac73d83e0d299e84472deb6491a823966a7686ed1487ef8405909981b9a12b661d8de7f086bd4b498594abac
 DIST opencc-1.1.4.tar.gz 2806887 BLAKE2B 150fd83818616de42e535f349b2574ff3319e41618e522583a57a00ab08b7f28db6e8f4fa4a0d4dbe027753b5be87065b2015542251986c6301ad441c4bf4c98 SHA512 ab8e7e6a0cc71106cf09eb32899fa8620b946a406f042d75a2444096e0b383cb1993d6c2d12cd7862e71854da4cd5893442bce51df84c32ed09fdfb4a2846f46
-EBUILD opencc-1.1.3.ebuild 1584 BLAKE2B 2648b515e72bb61064e0cdf0ac2adc8823dc13dd604d6795ad6640b5558ab1e63f4df023f61ff5b2ba417b95e04674534fd0051f97fa48f98fb3657e1d98fae4 SHA512 9ac4e2157b1338188652c77b33dd6f3077f25d6c22df74c98673b944ce88d506acea7dff257abf1132e0fd2d3114a5232206e46eb2762ce60b086b48a88b7e6f
 EBUILD opencc-1.1.4.ebuild 1584 BLAKE2B 2648b515e72bb61064e0cdf0ac2adc8823dc13dd604d6795ad6640b5558ab1e63f4df023f61ff5b2ba417b95e04674534fd0051f97fa48f98fb3657e1d98fae4 SHA512 9ac4e2157b1338188652c77b33dd6f3077f25d6c22df74c98673b944ce88d506acea7dff257abf1132e0fd2d3114a5232206e46eb2762ce60b086b48a88b7e6f
 EBUILD opencc-9999.ebuild 1533 BLAKE2B 7af70265939b180ea374cdf1f94160257c9bd3ba4c1f26eb70e1a2663e102466d0300ada0008aa29bf8788f1656d8b63475dcfbbb6ef89925b1ef671ff942a2e SHA512 a73dfa1a151602462a0406925963102224874bcff1eebfc277b461d0910310a69dff10ff0c9e5ce0bc5f0acf00f2bd7b9fc293090fbe00cc78c4c67d1e870b27
 MISC metadata.xml 624 BLAKE2B 0fc3325d54820e80e6800c408c9590b0ad55587f94f1cde371c1c2f5396eb650dc53e3d568eeab3e92739c5db142e698119dea51ccacaaed106765d03db9242c SHA512 562f4b08443ed1a7e9ff97b412d5e050ebb6d9e89cd6609302fdaa903cacd5a031f12360c7cbc2504b027b08d3690a119568760621cfeea0294916366bf5261c
diff --git a/app-i18n/opencc/opencc-1.1.3.ebuild b/app-i18n/opencc/opencc-1.1.3.ebuild
deleted file mode 100644
index ccdabe3b3bb3..000000000000
--- a/app-i18n/opencc/opencc-1.1.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2010-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake python-any-r1
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/BYVoid/OpenCC"
-fi
-
-DESCRIPTION="Library for conversion between Traditional and Simplified Chinese characters"
-HOMEPAGE="https://github.com/BYVoid/OpenCC"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/BYVoid/OpenCC/archive/ver.${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0/1.1"
-KEYWORDS="amd64 arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )"
-DEPEND="dev-cpp/tclap
-	dev-libs/darts
-	dev-libs/marisa:0=
-	dev-libs/rapidjson
-	test? (
-		dev-cpp/gtest
-		!hppa? ( !sparc? ( dev-cpp/benchmark ) )
-	)"
-RDEPEND="dev-libs/marisa:0="
-
-if [[ "${PV}" != "9999" ]]; then
-	S="${WORKDIR}/OpenCC-ver.${PV}"
-fi
-
-DOCS=(AUTHORS NEWS.md README.md)
-
-src_prepare() {
-	rm -r deps || die
-
-	cmake_src_prepare
-
-	sed -e "s:\${DIR_SHARE_OPENCC}/doc:share/doc/${PF}:" -i doc/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCUMENTATION=$(usex doc ON OFF)
-		-DENABLE_BENCHMARK=$(if use test && has_version -d dev-cpp/benchmark; then echo ON; else echo OFF; fi)
-		-DENABLE_GTEST=$(usex test ON OFF)
-		-DUSE_SYSTEM_DARTS=ON
-		-DUSE_SYSTEM_GOOGLE_BENCHMARK=ON
-		-DUSE_SYSTEM_GTEST=ON
-		-DUSE_SYSTEM_MARISA=ON
-		-DUSE_SYSTEM_RAPIDJSON=ON
-		-DUSE_SYSTEM_TCLAP=ON
-	)
-
-	cmake_src_configure
-}
diff --git a/app-i18n/scim-input-pad/Manifest b/app-i18n/scim-input-pad/Manifest
index cea714bfc2a9..1f339d8aa790 100644
--- a/app-i18n/scim-input-pad/Manifest
+++ b/app-i18n/scim-input-pad/Manifest
@@ -1,5 +1,3 @@
 DIST scim-input-pad-0.1.3.1.tar.gz 591478 BLAKE2B a89a4d5717f89125e9ae3a9f360e8746cd5eb8a41646e886aa3f9c341f9dbd3e36453ea071896002ae182476cccfb8114323ec6e2b363f7d1ca151e697f510bb SHA512 864a254814c0afa04c10143a6b0de4a927ff8612e01bed3776d09a910cfb12899c17245a89a0386f4fac59ebdaae9e6fb9dc9ff5981f72dbec952a9da52a413d
-DIST scim-input-pad-0.1.3.tar.gz 1362611 BLAKE2B a9defe7b70a11b39a405c8e490030bc31b8372b3a7636f7215d5d5a4e1920aff38a810ab5d02ce0d987cd8280b09483e7a77a670de6f26d305ee47d87c1c6c8d SHA512 2a7f52c92feb5f882827f8a7240da6dc347be0f34c5b378ee8c26aba39b925d56caff3145ef237c4e0604d65179b755124b8b40c507666b2f76d12715de1103c
 EBUILD scim-input-pad-0.1.3.1.ebuild 1427 BLAKE2B f5723e1a9b37e0ec37af7f5712df49b0a9c61e6ef472a5f249e6405751b5198de898f9f1e4646543e4aa541c06882d7481f013fcd6af1cacf8e4d35d8bd53dad SHA512 cea453fce630c5b46b46da0b0d9d5df5676d35ae8394864b3818dcfc6a23bf8f3e832810bb9a675a53593193aee21d019ec0a28553a907fb8de4615622dd2a04
-EBUILD scim-input-pad-0.1.3.ebuild 1427 BLAKE2B f1db14112a30a6e772e4477513860771c590e2798c67bfacff36860df014283de4941468f77d62ad7678474868cc777a6e36787c71c2fd30614ecdae8b80c6f4 SHA512 14c83ef4df7c9cace3839f186f5324bd965c0421c93f81ce4dd1031879718d9cd4c6e08e5a2b5614326e96491e673140a3682bb2698e3bde17ac23becf7995c4
 MISC metadata.xml 1731 BLAKE2B aca015101d6521616a6e40f7169ac546b03e318e6bb49dc1ba6843a0343d8ddc73476784553e581ac9314795ce3dbbbca145252f45fcb45df430415e395e3914 SHA512 e0eaba4dbae865174a76bca6961de73cf4e86c55dc2a26971bd7fd5a95833cbd18e8dfa6a8da6aef9988505522d1ee45dac29c6c72a2d917c107a3b3dc0bd227
diff --git a/app-i18n/scim-input-pad/scim-input-pad-0.1.3.ebuild b/app-i18n/scim-input-pad/scim-input-pad-0.1.3.ebuild
deleted file mode 100644
index 0cbb2a9701e8..000000000000
--- a/app-i18n/scim-input-pad/scim-input-pad-0.1.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Input pad for SCIM used to input symbols and special characters"
-HOMEPAGE="http://www.scim-im.org/"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND="
-	>=app-i18n/scim-1.2.0
-	>=x11-libs/gtk+-2.6.0:2"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-util/intltool-0.33
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	rm m4/intltool.m4 || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-
-	# no static archives
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog
-	elog "The SCIM input pad should be startable from the SCIM (and Skim)"
-	elog "systray icon right click menu. You will have to restart SCIM"
-	elog "(or Skim) in order for the menu entry to appear (you may simply"
-	elog "restart your X server). If you want to use it immediately, just"
-	elog "start the SCIM input pad, using the 'scim-input-pad' command."
-	elog
-	elog "To use, select the text zone you wish to write in, and just"
-	elog "click on the wanted character in the right multilevel tabbed"
-	elog "table, from the SCIM Input Pad interface."
-	elog
-	elog "To add new characters to the tables, see the documentation"
-	elog "(README file in ${EROOT}/usr/share/doc/${PF})."
-	elog
-}
diff --git a/app-i18n/skk-jisyo/Manifest b/app-i18n/skk-jisyo/Manifest
index 76470c647515..0789f6280255 100644
--- a/app-i18n/skk-jisyo/Manifest
+++ b/app-i18n/skk-jisyo/Manifest
@@ -1,6 +1,4 @@
-DIST skk-jisyo-201905.tar.xz 6198572 BLAKE2B a26e0be0406699424b24a8d1b004317b5d274fc02ed50ef6c4c696de8e039a6cfd7b34b292b7b7ecbdc2fee1950f6cc2a122ef457ba12f96972584560d3ac355 SHA512 db32fab5d5bf232838a3d502d4f648dde556381df9f96acec13d011274dedf5443676ce36324430dbe8cacb6a037e7bf70e72ef46b94fc6b57b9448e76aab38b
 DIST skk-jisyo-202005.tar.xz 6836292 BLAKE2B 6d73e6d2e38de178c6683ae447b0ea79054036739b7a01fe386d677cc99556d37f47adf4156e1d571681195b85a2134cac710b12fa08df87e4fe5e5098289119 SHA512 7cc639b307d56d4cb5d04280a003ffa2cfb326f7821d70dddb619e117c1b8358417e44f8137de1b8027ec7f97df8bff8fba845019c015cf8c48ed5d91753155c
-EBUILD skk-jisyo-201905.ebuild 1338 BLAKE2B f54ac476f9d2cc2dce7b907ce6cc612d6a546e91e0154b6aec3f505f3a92cbef4040f55f4e735e7be52e81c86e7caba1d5d4ea426e2d96e8ecf92ea203398101 SHA512 48f22e0d845a5cd5e13f2a1944cadb2b4d556891f5f77e0e9a566087678571e6a6bbe9cee1741d18834e7d93e5b330f2ab0d6b3c870d14330d3fc96bd9cb64ba
-EBUILD skk-jisyo-202005.ebuild 1376 BLAKE2B 5f5bbd3c67617c9fb1f0fb4aa117c083318a1096f23e0de88ce21f9648d942b587e2fb24e7b2fb8235ec44a78bbb34af07fd959d65ae64200148379b78b3a38e SHA512 a913fd31a20559f20c31261bd5348cd102a3da5a8749ecc5a1125c22e8a25e28b42a32894cb65062eb43c8e55875827c40d9858670ac672b883adda1d3c176aa
+EBUILD skk-jisyo-202005.ebuild 1375 BLAKE2B 5f36ab36e2c0c17d85dc73a180bcc3845f327cc4f888170c8e8c601e669799dae1fb4f25f023dd2e3e197893bba8589d1195a88024a1e3b51a0746dc021c9850 SHA512 b7f855e2642ff7c13a81fce6579ac341a6168ddee02446dbfc40d3abd4b59e3713f2bceb12dc5440901c6081a7aaa16c0e812d13af9f7c870477310e202be7ac
 EBUILD skk-jisyo-999999.ebuild 1693 BLAKE2B bda980c91b9bfaabd869630e1a57395714a242b4d47622928e34207ac5db6b5bd5dd381d6d2b36d5e4d5ef767b809dd7d6887fa31e740f2fb254c7fd6a003e6d SHA512 ddd348d3908d049248919cf3ca8f4e8079d70e90693cfbf2b76510d360f347a46e16273eec2c249e8cddb24e1d2e6d8b9860f7bad79cf642233f2bf3eae5f46c
 MISC metadata.xml 235 BLAKE2B a3e5a3109b59e3f97ef14f8d55ba13b16dc5371a1b7d6f238230aa4494db32dd4a42e3ee012ec8b18fae394feb2b1b56882bc70504aa7c6b969c1b20140f0ece SHA512 7c4e5f5dea465e45c662f5f53513626088aff514e1326593426af227d77e63d8a00d8af05aa208881a399f83dd41e73cd2ef81c8b7f275a2fa891f295231d67c
diff --git a/app-i18n/skk-jisyo/skk-jisyo-201905.ebuild b/app-i18n/skk-jisyo/skk-jisyo-201905.ebuild
deleted file mode 100644
index f2f413fc1a58..000000000000
--- a/app-i18n/skk-jisyo/skk-jisyo-201905.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-MY_PN=${PN^^}
-
-DESCRIPTION="Jisyo (dictionary) files for the SKK Japanese-input software"
-HOMEPAGE="http://openlab.ring.gr.jp/skk/dic.html"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~hattya/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2 freedist public-domain"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="cdb"
-
-DEPEND="virtual/awk
-	cdb? (
-		|| (
-			dev-db/tinycdb
-			dev-db/cdb
-		)
-	)"
-RDEPEND=""
-
-DOCS=( ChangeLog{,.{1..3}} committers.txt edict_doc.txt )
-
-src_prepare() {
-	rm -f ${MY_PN}.{wrong*,noregist,not_wrong,hukugougo,notes,requested,pubdic+}
-
-	default
-}
-
-cdb_make() {
-	cdbmake "${1}" "${1}.tmp"
-}
-
-tinycdb_make() {
-	cdb -c "${1}"
-}
-
-src_compile() {
-	if use cdb; then
-		local cdbmake=cdb_make f
-		if has_version dev-db/tinycdb; then
-			cdbmake=tinycdb_make
-		fi
-		for f in {,zipcode/}${MY_PN}.*; do
-			LC_ALL=C awk '
-				/^[^;]/ {
-					s = substr($0, index($0, " ") + 1)
-					print "+" length($1) "," length(s) ":" $1 "->" s
-				}
-				END {
-					print ""
-				}
-			' ${f} | ${cdbmake} ${f}.cdb || die
-		done
-	fi
-}
-
-src_install() {
-	insinto /usr/share/skk
-	doins {,zipcode/}${MY_PN}.*
-
-	einstalldocs
-	docinto zipcode
-	dodoc zipcode/README.md
-}
diff --git a/app-i18n/skk-jisyo/skk-jisyo-202005.ebuild b/app-i18n/skk-jisyo/skk-jisyo-202005.ebuild
index 8b6b9b171519..5656df1d6f58 100644
--- a/app-i18n/skk-jisyo/skk-jisyo-202005.ebuild
+++ b/app-i18n/skk-jisyo/skk-jisyo-202005.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="CC-BY-SA-3.0 GPL-2+ public-domain unicode"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="cdb"
 
 DEPEND="virtual/awk
diff --git a/app-i18n/skktools/Manifest b/app-i18n/skktools/Manifest
index ee691faa80e7..edde257ebab0 100644
--- a/app-i18n/skktools/Manifest
+++ b/app-i18n/skktools/Manifest
@@ -1,6 +1,4 @@
 AUX 50skktools-gentoo.el 91 BLAKE2B 290cc5542c31bd9c3cd0095162928c80548db2800fc0a6293a8d6cc65caf3f567be725c17a3592f66554a90bd8f86f13641cf3c51dbf6331fc5d5ccce55e9f55 SHA512 f4376f1146586604bc9ef1ea080e5df79f721a245b89ae76dfa2aee38876e38edb804f9201d9eb751a879d017ed929fa18d1b38b307879fa607d086a404d0612
-DIST skktools-1.3.3_p20170305.tar.gz 483715 BLAKE2B 0de2cb906e8433f66e706f0aa4dd8c4900343b48bfb9bb24aee4927f583650f54132c2a3bb607c17cefb0f0e686bcf8a0f4bd6ac07b6a9a71c0bd870eda587a7 SHA512 f6e9041fecf8c28a84c3996ca120371528c034eeca3695cb224b4cf225e8dab9e69969d7fb955112cd1e9c1e80c2ba8e2aef4f0eb81f55374dd626402482c235
 DIST skktools-1.3.4.tar.gz 482860 BLAKE2B f9e822531f8f715291e55ec6dec0eeb31683dc72efc7ba73621cfd0c29f0c5147cbef8256d44848792b8a1601c1878321b2dc0260df9d32d0e5e18eb65220987 SHA512 8749dfc4f18474db860d8b7cd85fadfc00327b199addb31a339aa78dd66cb98032429664bdad4b47176b5b64b156b7264bc35a284861f6b9ec8cc9979d4d5ce1
-EBUILD skktools-1.3.3_p20170305.ebuild 1207 BLAKE2B aaca802b0bd5e3dc85b72b81269360829dd3e01b1284b186618c4c7e06e8b922a83355292800a9c5463888c80511c23e6dd343156e5f7de2fa285df94f154c1f SHA512 0ef2f85e7ffa45a2636de95b11deb947dc432cfa7da572b3250c9ef79c24891c0ca81c684e087dc13e2e8909df4b66d6ea68e88cbc1ffcc303728bb13de85f0f
 EBUILD skktools-1.3.4.ebuild 1124 BLAKE2B 9c1a48cfc1b03fbd6bb0612a546477f40a3f39d00516544f4dcec5a892ce0453b44173afb723a0582c09d0b969f46596882b51efa6d8242a8f535f2eed2308c8 SHA512 5d894a04b1702fcc5173fd8d0424ae9a69ee9fdcc44e0ee4e24996f1024fea940e858fa2ef712098b7da077f1edfd2bb5212bf17c5cad6fb01c0c01206e4b8c8
 MISC metadata.xml 326 BLAKE2B cf8a67f6a5482d8f64fd24ccf6f2378ae9bd4fb1c7ef984c646a0aef0f3f460964872d98e0b0be0a99eadd7df895acf86b2b528ec149fe46312bd33a3b9a3099 SHA512 138de78f691aa42b3046869dc5c5ecfaf086adc5b79a734291a42cb9a19d601e8418ae04fa18bbb8701246c5cb239344e6e915f018bb534712ea2ccf27ea3575
diff --git a/app-i18n/skktools/skktools-1.3.3_p20170305.ebuild b/app-i18n/skktools/skktools-1.3.3_p20170305.ebuild
deleted file mode 100644
index b7fa7d4f12d0..000000000000
--- a/app-i18n/skktools/skktools-1.3.3_p20170305.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit elisp-common vcs-snapshot
-
-EGIT_COMMIT="e14d98e734d2fdff611385c7df65826e94d929db"
-
-DESCRIPTION="SKK utilities to manage dictionaries"
-HOMEPAGE="http://openlab.jp/skk/"
-SRC_URI="https://github.com/skk-dev/skktools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="emacs"
-
-RDEPEND="dev-libs/glib:2
-	sys-libs/gdbm
-	emacs? ( >=app-editors/emacs-23.1:* )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( ChangeLog README.md )
-SITEFILE="50${PN}-gentoo.el"
-
-src_configure() {
-	econf --with-gdbm
-}
-
-src_compile() {
-	default
-
-	if use emacs; then
-		elisp-compile *.el
-	fi
-}
-
-src_install() {
-	default
-	dodoc READMEs/*
-
-	local d
-	for d in convert2skk filters; do
-		newdoc ${d}/README.md README.${d}
-		rm -f ${d}/README.md
-	done
-
-	insinto /usr/share/${PN}
-	doins *.awk *.scm
-	rm -rf convert2skk/obsolete
-	doins -r convert2skk filters
-
-	if use emacs; then
-		elisp-install ${PN} *.el{,c}
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/app-i18n/sunpinyin-data/Manifest b/app-i18n/sunpinyin-data/Manifest
index ab94f3e319df..ee81b2e94cbe 100644
--- a/app-i18n/sunpinyin-data/Manifest
+++ b/app-i18n/sunpinyin-data/Manifest
@@ -1,7 +1,4 @@
-DIST dict.utf8-20130220.tar.bz2 652859 BLAKE2B 9e0cdefc0db519b0e12dd2cb2621ef500e0ed5a0ff9a0eea76d6f64eac1cdb455f2d3c8a806fe7aa8c50cbc369c0ef6d937fdf01fecbc349773b12375bb419f3 SHA512 d58ec106959a7713e452df2fe2fa5a5f66e82bd67eeeee8740cd3eeedf30af8d14a90dae224ed2931dffd85b0327c704927409bde0247452d79cf40c5bc7cff8
 DIST dict.utf8-20131214.tar.bz2 674512 BLAKE2B b5e1756b52e8b4fd7839d4a72004b7ddc789986899cc626341f13b702ee1e0b54780c992b2988289bdbe7ff979f3243efc1b5a5e04a0529b9a3f6b327a49faef SHA512 adaf52a27c6afdeb950912845f3fcb7a6799f997d50a2892ceecf76ed13e3644407338d734832c2ce4b09bce11fec4731774f1eb2dd4c30bea5490555915bd5b
 DIST lm_sc.3gm.arpa-20140820.tar.bz2 36623028 BLAKE2B 9456c51dbba59e5d20a1bdd9b06f0ef863c77eb7651287b45f143e6919aedf46ea81ca4da5c037c4b9775c19e68849720cb0e1b3db4cc9dd8df84832ac2eba6a SHA512 ea3ede62eb993c4d21ca7cf339635f4686493a0cefd57df4a31f00a001e67502a13ff9612ff667b941b82b47de00be9f3c9689677d04195a7ef8716bac087519
-DIST lm_sc.t3g.arpa-20121025.tar.bz2 36262281 BLAKE2B 55d8820228986f9a7b3d567ebca7bf37079e3d05f9b062814116702957e4447c5283ac9034b6a9171a9696df01398bb29ea55a2a1ded3a952e48f14a697d8698 SHA512 3159dd3700382cfa617ba025ce542660580f3057e0dd6bbb92947902495db08e4454c1d09d01a55c90653444513d125dd034e944b060a9d8e009c3633b106d97
-EBUILD sunpinyin-data-20130220.ebuild 984 BLAKE2B fdce14f8c0249901c821f913a793273dfd6c1be537656323ec28b428bec3758e45f065b89e5b62bd2066ab204410c81f61d5fdceb7bd51aebef32d54747926d4 SHA512 b58d6e341b56027aebe84fc5144a3b1da3c83feeabf4392a4c39e77f88b8a9d4c1ae7ec0075d822ac24be031c13cc72b5be530a1678fcf87b87ba4fb79b2d559
-EBUILD sunpinyin-data-20140820.ebuild 1121 BLAKE2B 70513ef3c2bffc21fbf0b613c7cd2de56a6d24898c8a8fdb1f8223c51664c9832b219876c1a177b7aabdd11f1a09551b907a4dc162b476cb3f8307a9ed310068 SHA512 932464ac49530dbacc9b23514caccc51d6d486d09235ddde4afff78f08c3c2d0a72eefbd91ec945e72126131ef1b625e9d08c105087f29eefda6677c4b23dd32
+EBUILD sunpinyin-data-20140820.ebuild 1120 BLAKE2B 5e0fe189975aff78dd8c1aa060dd38410ec3bbf48c9fc69afe25cdcf1ef564ddece901625f5ffe613851d3bb36c81a9dad3912d2817380d5a35ee3fbc2373c86 SHA512 095437b862ae66316c108134e60aaee8cd952b053e23eacbb96f52d0feb470e87b92b9f15618001263af1093576162da536e2d0945ed33449c27abc6edcbb294
 MISC metadata.xml 329 BLAKE2B e8af2229536f58bd5a36e51afd60c63ef56bf4d02002e90fa7cd9b97681a610cd669bd1c83ee48b441a9167903511faff140197ea51ccbafb85f8323ba6e5642 SHA512 f79be60ea988b1a0db4b8c2b84e47a078717eced5c456919ab588828b14a7d503d17d051650ab86cb17d77b6d671c7ed0720f848b4125074866966493a8cdec0
diff --git a/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild b/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild
deleted file mode 100644
index 81a424941c72..000000000000
--- a/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DICT_VERSION="${PV}"
-LM_VERSION="20121025"
-
-DESCRIPTION="Data sets for Sunpinyin"
-HOMEPAGE="https://github.com/sunpinyin/open-gram"
-SRC_URI="mirror://sourceforge/open-gram/dict.utf8-${DICT_VERSION}.tar.bz2
-	mirror://sourceforge/open-gram/lm_sc.t3g.arpa-${LM_VERSION}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND="=app-i18n/sunpinyin-2.0.4*"
-
-src_unpack() {
-	default
-	mkdir "${S}" || die
-	mv "${WORKDIR}"/dict.utf8 "${S}" || die
-	mv "${WORKDIR}"/lm_sc.t3g.arpa "${S}" || die
-}
-
-src_compile() {
-	# lm_sc.t3g
-	echoit tslmpack lm_sc.t3g.arpa dict.utf8 lm_sc.t3g.orig
-	echoit tslmendian -i lm_sc.t3g.orig -o lm_sc.t3g
-	# lexicon3
-	echoit genpyt -i dict.utf8 -s lm_sc.t3g.orig -l pydict_sc.log -o pydict_sc.bin
-}
-
-echoit() {
-	echo "${@}"
-	"${@}"
-}
-
-src_install() {
-	insinto /usr/share/${PN/-data}
-	doins lm_sc.t3g pydict_sc.bin
-}
diff --git a/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild b/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild
index 9ce101932028..c2bcae4866a7 100644
--- a/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild
+++ b/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/open-gram/dict.utf8-${DICT_VERSION}.tar.bz2
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 IUSE=""
 
 # https://github.com/sunpinyin/sunpinyin/commit/0fff1e78d9a409205e025736286838721a2ccbf8
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 37fea15dc548..cfef5cb21f88 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,7 +1,4 @@
 AUX 50uim-gentoo.el 71 BLAKE2B 94142633d1a13a0d4ea71e4325883be1e407e154277a4a361701bf694b62e3e8855d4627a72015fb04b1470e128df80fefcdb999e2f1090fa03a454287af52f2 SHA512 e2b6d74d14cdf7d81ab128b2e4ffe1d7dcc0013d61685687ca92619704fd38ec1da6a12fabc3878aa7a9ddd9bf0194c499d3100f176f0a96920322a451c04831
-AUX uim-1.8.8-c++11.patch 861 BLAKE2B b9072af1065cd9103847a076f6327684c5c014d9e19252cd3f5ff0cf3d1821e67dba2603baccc55709178f6be532e3ad6dacca5e121c96d5da4f210b6094f943 SHA512 8b15b6c7100646ca5b86f93dbfae139837cee0fbb19ae6c5164e249ea827376cb51be52b2a0837533bb1c394f129baafb52cefa2c42f43dd9ec9e502678e26b1
-AUX uim-1.8.8-desktop.patch 1242 BLAKE2B 40b51a7e2c94f02bce09c9baa7059af76f7faa3458cd65491f06b08fc1a11debd281196d190b7e80ffd70e763e9e8816b07287871c86c7eb9540732fbeaf2f30 SHA512 bee999b906958c72e149ad07eb86a8f46163b7dbbb0236e37f26f30cb41e7fc871b979790435a0306039f2533c9e60ff990a2b37bd80f2585e3d9014c6bc8075
-AUX uim-1.8.8-fno-common.patch 375 BLAKE2B 88cf3f86fd23e3d9735c3c12df299c678fb332a39937cad0408fcbfdb653eb6084d3b693ceec42e047c7cfe37a78ea8982d49bd9260135169e4af2d2af64be31 SHA512 898ce37332bd02ccc063facb922a965928962f7ecccbb5e74a57d64069eda235f33f7e899e94f8d48e17a58b32a1e98d9eed2dcd9c73eafd012fc0150eba13b4
 AUX uim-1.8.9_pre20210103-remove-Wconversion-replace.patch 567 BLAKE2B 7241f18b4efa84f3eecae63027aef169eb7ce3ab068bf3f1b225ab5ff597008c017c6da54817bc4db18578c8654031b56afd149936f2825f803db959dad28636 SHA512 b193a7e689b955b966cb5f402336de0b96f23a9d9f831907863ddc4cbaf63080509f514ddc35a67f75d19c65bbfadbf4883b65ae83faa7c741cf7ec80ddf3f50
 AUX uim-gentoo.patch 601 BLAKE2B fba57214c7e222e9f042cda4194738ffd170787d3d5431415a9a26632b25bdd9566489352ee4e64f396add88f270931320faed73652002fe67a379f1d644ff65 SHA512 002538e809f174f026df354ebcd4b487d42c0e9f7e409b8c97240969ec3be55f22b754ea34d707fb8eadab1321dd8a3c4b7861b51a606eb741f314f20e473f4a
 AUX uim-kde.patch 2193 BLAKE2B 38e049b372cf2854879627186a2f014265e410ace9657cfd6afaf9c08bbfc5b4df208a8207861a9edab32c058847b01b3a8ba1b5cf4f88ab6d2d213c494c64d4 SHA512 4ff8306ea451233836f78096eaafd739e1d9c19d9c48230963c7d98c23860ecc649e1e94eb1569e959a2932eae3fb74641e274cb72212a962d149dcde09a0537
@@ -11,9 +8,6 @@ AUX uim-xkb.patch 400 BLAKE2B 54992f9ef87e4ede3e2beaadf4bd55c018b0aec3eb645b7716
 AUX uim-zh-TW.patch 871 BLAKE2B 091efbed0182f05c87e5a5c789ca7ea3862e61566dad5411a5158b348e73123a60efe869b7aa8d43af603ba01e908eb5d135762069abb3c01951a144739b6126 SHA512 0cf0955cded7870b5012f283adb30dbbab6fee9d468178248987036cd3e78fc21e1279481289f9400784fb1e59fda91d1cc8ac1cc8b3d57f0f24258b8b9f40f4
 AUX xinput-uim 108 BLAKE2B f66525e52af923170224ca9953e82489d7f6f92c3e83d96452663ebd538723d1dbaaaa4233bf2bebe1ad6f783fffd4e3e4e82bba5f6fd92d0ef88e3cbaaff6eb SHA512 b3ba31a87e19f589ac8051ece45b6b6c44b295dde76a5ce6164d1e435d791c4e7cafc7192177384f4052fd928caabb8574a9192cf783f4cb22e4ee16741343fc
 DIST sigscheme-0.9.1.tar.bz2 1140162 BLAKE2B a649ec1a5ff0899af14fa686ea7cf43140c226b1df68d4c9415c3b95c7f7ae32c539df820f0e9da7d7a809c88fa388e563549728c345017dfd62d418748be7e1 SHA512 b66b901e8a6bc6d9188112f78d3ba21a2a0776e1236aa9d2d83df27cf8111b8491f665062b493d14c2a9a1b4eb47ce2789b3ca7180225a085e94623329281e09
-DIST uim-1.8.8.tar.bz2 6228743 BLAKE2B 8fc44b61239f766ba3d9ebf3201c11471b3a844e082237f5ec97dd0fa6fbb04a0a588df5c0479a0aa4bcb4d9c4edcc93c36ec68618701c8aa88fa30732fdce28 SHA512 2257ae48f4f2b79039a5f6be0fc740e218d5609e004dad9a5a1aa5d4066587ee59d0be06bc23c7d567a48901466227fedc4778b480f7184d84b0b3b4dddac9a3
 DIST uim-1.8.9_pre20210103.tar.gz 4054622 BLAKE2B b50bafe9b0edbac1ab7e56afd5b654bdef793b606df3550ba7b8be467076005925bf2c5d221bbf3b3dbcdc5079bbb0e014ed29bef9b6a55c23384cb281411104 SHA512 39e046a8ee3bbc06ff0bab685e0ded8f63e9c474661ffecf7ed12e25cad3151498b2fecc7f14ca6f0c78974e55265df47d656a55bf158b41fe21a69071d02fe8
-EBUILD uim-1.8.8-r2.ebuild 5589 BLAKE2B b4f750239c437aa66b25088da122675e7426d4f3d1c12d1a03b51a012e2cfe1f6a31314d5f7f764ffb04936991d01a6de804096a1ea7397e611b9c2cf3903d2a SHA512 fe8b7b59138c2631bf047e917214c5e616617bcccd3643ae6ba1517b399378fe0c414922e6c6bb249c8a2499d93ac1d94d8c22538a8770814148a9787f126724
-EBUILD uim-1.8.9_pre20210103-r1.ebuild 6063 BLAKE2B ea971dc2fc1350aa05d2e9b40e9454d3afe80b2e9d05af541028cf515468db53fcb7cb0cfd09e16e9724ed48cc483c42bbb50f4c45396b592a7c7161ef86837f SHA512 1df2d3f5e42690208412b38ec0d9f030602dfb3e841b3be290f13f587274d71d9b875884e1b260d76cc4d37860cb3657db271bf8e349c67a78919da3c3b09c9e
-EBUILD uim-1.8.9_pre20210103.ebuild 5989 BLAKE2B 31a26cec7657cc27a9371f7e3407e709f06c7b404364d587f355a3b68e66da176848e6273df03a81f2d2430c7fb8bb410ee6a8814ab3ae4dabbdd83e30a5ac9f SHA512 7b00bd839a4251a8be74bf4cfb150308c52236572d4299838d16701b42f787744facd95b4873bbcece5e680004b33d5e06265dc194b200a3dcf513a48d9bd318
+EBUILD uim-1.8.9_pre20210103-r1.ebuild 6062 BLAKE2B 75626aa3aa3f832825bbb8da37064225ff85338cdae260bd6a121396e4b27c5311addefc037abeb58b9069efa4fcaa3eede9f9f8a6cb57b0d8b1755e9c43f9a2 SHA512 b306c17fbf4db915399c7a2efa35bbf1342fe205ef35bc1b030f2210d4b13ccd8e401901f56a851470691433ddce8933623b9a8ea57500d853bd083dcdaead8d
 MISC metadata.xml 1059 BLAKE2B 7ddf7ebb4c6fa262fb369edabe5bc106023d8b4960ea067fab673c6ca9a489190e591e92e4c14df617318e5feb08d3c064fbdaa5f1ea66a6ebf983a8154a3828 SHA512 c412582600c38a9c171e3e45cf2bfbac0ac3682d5ab1f367ef3e988a4702e8d36cba58ea4f9c34b28493150f34c863c6071b8c02eb3b68bfe5f3b8f98a195c79
diff --git a/app-i18n/uim/files/uim-1.8.8-c++11.patch b/app-i18n/uim/files/uim-1.8.8-c++11.patch
deleted file mode 100644
index 07e082840967..000000000000
--- a/app-i18n/uim/files/uim-1.8.8-c++11.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From bb25aac568359efbfb68e52dd8d9ee85e65d754b Mon Sep 17 00:00:00 2001
-From: Haelwenn Monnier <lanodan@users.noreply.github.com>
-Date: Thu, 25 Oct 2018 09:10:16 +0200
-Subject: [PATCH] xim/main.cpp: FIx build against clang
-
-main.cpp:68:55: error: invalid suffix on literal; C++11 requires a space between literal and identifier
----
- xim/main.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xim/main.cpp b/xim/main.cpp
-index a0b0beceb..c5818ca4a 100644
---- a/xim/main.cpp
-+++ b/xim/main.cpp
-@@ -65,7 +65,7 @@ int g_option_mask;
- int scr_width, scr_height;
- int host_byte_order;
- 
--#define VERSION_NAME "uim-xim under the way! Version "PACKAGE_VERSION"\n"
-+#define VERSION_NAME "uim-xim under the way! Version " PACKAGE_VERSION "\n"
- const char *version_name=VERSION_NAME;
- const char *usage=
- "--help , --version :Show usage or version\n"
diff --git a/app-i18n/uim/files/uim-1.8.8-desktop.patch b/app-i18n/uim/files/uim-1.8.8-desktop.patch
deleted file mode 100644
index 5e0687547915..000000000000
--- a/app-i18n/uim/files/uim-1.8.8-desktop.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 63cda66c1665b8ccc9ae11a5a4fb341afb8c5ac0 Mon Sep 17 00:00:00 2001
-From: OBATA Akio <obache@users.noreply.github.com>
-Date: Mon, 30 Dec 2019 22:26:11 +0900
-Subject: [PATCH] Fix to use pref tool with default toolkit (#151)
-
----
- configure.ac      | 1 +
- uim.desktop.in.in | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 472c67f02..d530bc081 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1188,6 +1188,7 @@ AM_CONDITIONAL(DEFAULT_TOOLKIT_GTK3, test "x$default_toolkit" = xgtk3)
- AM_CONDITIONAL(DEFAULT_TOOLKIT_QT,  test "x$default_toolkit" = xqt)
- AM_CONDITIONAL(DEFAULT_TOOLKIT_QT4, test "x$default_toolkit" = xqt4)
- AM_CONDITIONAL(DEFAULT_TOOLKIT_QT5, test "x$default_toolkit" = xqt5)
-+AC_SUBST(default_toolkit)
- 
- AC_ARG_ENABLE(fep,
-   AC_HELP_STRING([--disable-fep],
-diff --git a/uim.desktop.in.in b/uim.desktop.in.in
-index b4a4d4f50..38c5c6d5e 100644
---- a/uim.desktop.in.in
-+++ b/uim.desktop.in.in
-@@ -3,7 +3,7 @@ Type=Application
- _Name=Input Method
- _Comment=Customize uim input method environment
- _Keywords=input;method;
--Exec=uim-pref-gtk
-+Exec=uim-pref-@default_toolkit@
- Icon=@uim_pixmapsdir@/uim-icon.png
- Terminal=false
- Categories=Settings;X-GNOME-PersonalSettings;
diff --git a/app-i18n/uim/files/uim-1.8.8-fno-common.patch b/app-i18n/uim/files/uim-1.8.8-fno-common.patch
deleted file mode 100644
index ff974bb5d5b2..000000000000
--- a/app-i18n/uim/files/uim-1.8.8-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/sigscheme/libgcroots/include/private/gc_priv.h
-+++ b/sigscheme/libgcroots/include/private/gc_priv.h
-@@ -1979,7 +1979,7 @@
-   /* the signal mask.						*/
- # define SETJMP(env) sigsetjmp(env, 1)
- # define LONGJMP(env, val) siglongjmp(env, val)
--# define JMP_BUF sigjmp_buf
-+# define JMP_BUF extern sigjmp_buf
- #else
- # ifdef ECOS
- #   define SETJMP(env)  hal_setjmp(env)
diff --git a/app-i18n/uim/uim-1.8.8-r2.ebuild b/app-i18n/uim/uim-1.8.8-r2.ebuild
deleted file mode 100644
index dd5bb5fe65e5..000000000000
--- a/app-i18n/uim/uim-1.8.8-r2.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools elisp-common flag-o-matic gnome2-utils qmake-utils
-
-DESCRIPTION="A multilingual input method framework"
-HOMEPAGE="https://github.com/uim/uim"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
-IUSE="X +anthy curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft"
-RESTRICT="test"
-REQUIRED_USE="gtk? ( X )
-	gtk2? ( X )
-	qt5? ( X )
-	xft? ( X )"
-
-CDEPEND="X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXft
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-	anthy? ( app-i18n/anthy )
-	curl? ( net-misc/curl )
-	eb? ( dev-libs/eb )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	expat? ( dev-libs/expat )
-	gtk? ( x11-libs/gtk+:3 )
-	gtk2? ( x11-libs/gtk+:2 )
-	libedit? ( dev-libs/libedit )
-	libffi? ( dev-libs/libffi:= )
-	libnotify? ( x11-libs/libnotify )
-	m17n-lib? ( dev-libs/m17n-lib )
-	ncurses? ( sys-libs/ncurses:0= )
-	nls? ( virtual/libintl )
-	qt5? ( dev-qt/qtx11extras:5 )
-	skk? ( app-i18n/skk-jisyo )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl:0= )"
-DEPEND="${CDEPEND}
-	X? ( x11-base/xorg-proto )"
-RDEPEND="${CDEPEND}
-	!dev-scheme/sigscheme
-	X? (
-		media-fonts/font-sony-misc
-		l10n_ja? (
-			|| (
-				media-fonts/font-jis-misc
-				media-fonts/intlfonts
-			)
-		)
-		l10n_ko? (
-			|| (
-				media-fonts/font-daewoo-misc
-				media-fonts/intlfonts
-			)
-		)
-		l10n_zh-CN? (
-			|| (
-				media-fonts/font-isas-misc
-				media-fonts/intlfonts
-			)
-		)
-		l10n_zh-TW? ( media-fonts/intlfonts )
-	)"
-BDEPEND="dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-gentoo.patch
-	"${FILESDIR}"/${PN}-slibtool.patch
-	"${FILESDIR}"/${PN}-tinfo.patch
-	"${FILESDIR}"/${PN}-xkb.patch
-	"${FILESDIR}"/${PN}-zh-TW.patch
-	"${FILESDIR}"/${P}-c++11.patch
-	"${FILESDIR}"/${P}-desktop.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-)
-DOCS=( AUTHORS NEWS README RELNOTE doc )
-
-AT_NO_RECURSIVE="yes"
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	default
-	sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
-	# fix build with >=dev-scheme/chicken-4, bug #656852
-	touch scm/json-parser-expanded.scm
-	# fix build with "-march=pentium4 -O2", bug #661806
-	use x86 && append-cflags $(test-flags-CC -fno-inline-small-functions)
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_with X x)
-		$(use_with anthy anthy-utf8)
-		$(use_with curl)
-		$(use_with eb)
-		$(use_enable emacs)
-		$(use_with emacs lispdir "${SITELISP}")
-		$(use_with expat)
-		$(use_with libedit)
-		$(use_with libffi ffi)
-		$(use_with gtk gtk3)
-		$(use_with gtk2)
-		$(use_with m17n-lib m17nlib)
-		$(use_enable ncurses fep)
-		$(use_enable nls)
-		$(use_with qt5)
-		$(use_with qt5 qt5-immodule)
-		_QMAKE5=$(qt5_get_bindir)/qmake
-		$(use_with skk)
-		$(use_with sqlite sqlite3)
-		$(use_enable ssl openssl)
-		$(use_enable static-libs static)
-		$(use_with xft)
-		--without-anthy
-		--without-canna
-		--enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk $(usex qt5 qt5)))
-		--disable-gnome-applet
-		--disable-gnome3-applet
-		--disable-kde-applet
-		--disable-kde4-applet
-		--without-mana
-		--without-prime
-		--disable-qt4-qt3support
-	)
-
-	if (use gtk || use gtk2) && use anthy; then
-		myconf+=( --enable-dict )
-	else
-		myconf+=( --disable-dict )
-	fi
-
-	if use libnotify; then
-		myconf+=( --enable-notify=libnotify )
-	fi
-
-	if use gtk || use gtk2 || use qt5; then
-		myconf+=( --enable-pref )
-	else
-		myconf+=( --disable-pref )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	if use emacs; then
-		cd emacs || die
-		elisp-compile *.el || die
-		cd - >/dev/null || die
-	fi
-}
-
-src_install() {
-	# bug #222677
-	emake -j1 DESTDIR="${D}" install
-	rm -f doc/Makefile*
-	einstalldocs
-
-	find "${ED}"/usr/$(get_libdir)/${PN} -name '*.la' -delete || die
-	use static-libs || find "${ED}" -name '*.la' -delete || die
-
-	insinto /etc/X11/xinit/xinput.d
-	sed \
-		-e "s:@EPREFIX@:${EPREFIX}:g" \
-		"${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf
-	doins "${T}"/${PN}.conf
-
-	if use X; then
-		docinto xim
-		dodoc xim/README*
-	fi
-
-	if use emacs; then
-		elisp-install ${PN}-el emacs/*.el{,c}
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE} ${PN}-el
-		docinto emacs
-		dodoc emacs/README*
-	fi
-
-	if use ncurses; then
-		docinto fep
-		dodoc fep/README*
-	fi
-}
-
-pkg_postinst() {
-	elog "New input method switcher has been introduced. You need to set"
-	elog
-	elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
-	elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
-	elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
-	elog
-	elog "If you would like to use uim-anthy as default input method, put"
-	elog "(define default-im-name 'anthy)"
-	elog "to your ~/.uim."
-	elog
-	elog "All input methods can be found by running uim-im-switcher-gtk, "
-	elog "uim-im-switcher-gtk3 or uim-im-switcher-qt5."
-
-	if use emacs; then
-		elisp-site-regen
-		elog
-		elog "uim is autoloaded with Emacs with a minimal set of features:"
-		elog "There is no keybinding defined to call it directly, so please"
-		elog "create one yourself and choose an input method."
-		elog "Integration with LEIM is not done with this ebuild, please have"
-		elog "a look at the documentation how to achieve this."
-	fi
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-}
diff --git a/app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild b/app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild
index 10728a9c32cf..8bafde17b650 100644
--- a/app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.ta
 
 LICENSE="BSD GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~riscv x86"
 IUSE="X +anthy curl eb emacs expat libffi gtk gtk2 kde l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft"
 RESTRICT="test"
 REQUIRED_USE="gtk? ( X )
diff --git a/app-i18n/uim/uim-1.8.9_pre20210103.ebuild b/app-i18n/uim/uim-1.8.9_pre20210103.ebuild
deleted file mode 100644
index ac3fc65fc1a9..000000000000
--- a/app-i18n/uim/uim-1.8.9_pre20210103.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools elisp-common flag-o-matic gnome2-utils qmake-utils vcs-snapshot
-
-EGIT_COMMIT="d1ac9d9315ff8c57c713b502544fef9b3a83b3e5"
-SIG_PV="0.9.1"
-
-DESCRIPTION="A multilingual input method framework"
-HOMEPAGE="https://github.com/uim/uim"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	https://github.com/${PN}/sigscheme/releases/download/${SIG_PV}/sigscheme-${SIG_PV}.tar.bz2"
-
-LICENSE="BSD GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~x86"
-IUSE="X +anthy curl eb emacs expat libffi gtk gtk2 kde l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft"
-RESTRICT="test"
-REQUIRED_USE="gtk? ( X )
-	gtk2? ( X )
-	qt5? ( X )
-	xft? ( X )"
-
-CDEPEND="X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXft
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-	anthy? ( app-i18n/anthy )
-	curl? ( net-misc/curl )
-	eb? ( dev-libs/eb )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	expat? ( dev-libs/expat )
-	gtk? ( x11-libs/gtk+:3 )
-	gtk2? ( x11-libs/gtk+:2 )
-	kde? ( kde-frameworks/plasma:5 )
-	libedit? ( dev-libs/libedit )
-	libffi? ( dev-libs/libffi:= )
-	libnotify? ( x11-libs/libnotify )
-	m17n-lib? ( dev-libs/m17n-lib )
-	ncurses? ( sys-libs/ncurses:0= )
-	nls? ( virtual/libintl )
-	qt5? ( dev-qt/qtx11extras:5 )
-	skk? ( app-i18n/skk-jisyo )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl:0= )"
-DEPEND="${CDEPEND}
-	X? ( x11-base/xorg-proto )"
-RDEPEND="${CDEPEND}
-	!dev-scheme/sigscheme
-	X? (
-		media-fonts/font-sony-misc
-		l10n_ja? (
-			|| (
-				media-fonts/font-jis-misc
-				media-fonts/intlfonts
-			)
-		)
-		l10n_ko? (
-			|| (
-				media-fonts/font-daewoo-misc
-				media-fonts/intlfonts
-			)
-		)
-		l10n_zh-CN? (
-			|| (
-				media-fonts/font-isas-misc
-				media-fonts/intlfonts
-			)
-		)
-		l10n_zh-TW? ( media-fonts/intlfonts )
-	)"
-BDEPEND="dev-util/intltool
-	gnome-base/librsvg
-	sys-devel/gettext
-	virtual/pkgconfig
-	kde? ( dev-util/cmake )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-gentoo.patch
-	"${FILESDIR}"/${PN}-kde.patch
-	"${FILESDIR}"/${PN}-slibtool.patch
-	"${FILESDIR}"/${PN}-tinfo.patch
-	"${FILESDIR}"/${PN}-xkb.patch
-	"${FILESDIR}"/${PN}-zh-TW.patch
-)
-DOCS=( AUTHORS NEWS README RELNOTE doc )
-
-AT_NO_RECURSIVE="yes"
-SITEFILE="50${PN}-gentoo.el"
-
-src_unpack() {
-	vcs-snapshot_src_unpack
-	rmdir "${S}"/sigscheme || die
-	mv "${WORKDIR}"/sigscheme-${SIG_PV} "${S}"/sigscheme || die
-}
-
-src_prepare() {
-	default
-	sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
-	# fix build with >=dev-scheme/chicken-4, bug #656852
-	touch scm/json-parser-expanded.scm
-	# fix build with "-march=pentium4 -O2", bug #661806
-	use x86 && append-cflags $(test-flags-CC -fno-inline-small-functions)
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_with X x)
-		$(use_with anthy anthy-utf8)
-		$(use_with curl)
-		$(use_with eb)
-		$(use_enable emacs)
-		$(use_with emacs lispdir "${SITELISP}")
-		$(use_with expat)
-		$(use_enable kde kde5-applet)
-		$(use_with libedit)
-		$(use_with libffi ffi)
-		$(use_with gtk gtk3)
-		$(use_with gtk2)
-		$(use_with m17n-lib m17nlib)
-		$(use_enable ncurses fep)
-		$(use_enable nls)
-		$(use_with qt5)
-		$(use_with qt5 qt5-immodule)
-		_QMAKE5=$(qt5_get_bindir)/qmake
-		$(use_with skk)
-		$(use_with sqlite sqlite3)
-		$(use_enable ssl openssl)
-		$(use_enable static-libs static)
-		$(use_with xft)
-		--without-anthy
-		--without-canna
-		--enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk $(usex qt5 qt5)))
-		--disable-gnome-applet
-		--disable-gnome3-applet
-		--disable-kde-applet
-		--disable-kde4-applet
-		--without-mana
-		--enable-maintainer-mode
-		--without-prime
-		--disable-qt4-qt3support
-	)
-
-	if (use gtk || use gtk2) && use anthy; then
-		myconf+=( --enable-dict )
-	else
-		myconf+=( --disable-dict )
-	fi
-
-	if use libnotify; then
-		myconf+=( --enable-notify=libnotify )
-	fi
-
-	if use gtk || use gtk2 || use qt5; then
-		myconf+=( --enable-pref )
-	else
-		myconf+=( --disable-pref )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	if use emacs; then
-		cd emacs || die
-		elisp-compile *.el || die
-		cd - >/dev/null || die
-	fi
-}
-
-src_install() {
-	# bug #222677
-	emake -j1 DESTDIR="${D}" install
-	rm -f doc/Makefile*
-	einstalldocs
-
-	find "${ED}"/usr/$(get_libdir)/${PN} -name '*.la' -delete || die
-	use static-libs || find "${ED}" -name '*.la' -delete || die
-
-	insinto /etc/X11/xinit/xinput.d
-	sed \
-		-e "s:@EPREFIX@:${EPREFIX}:g" \
-		"${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf
-	doins "${T}"/${PN}.conf
-
-	if use X; then
-		docinto xim
-		dodoc xim/README*
-	fi
-
-	if use emacs; then
-		elisp-install ${PN}-el emacs/*.el{,c}
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE} ${PN}-el
-		docinto emacs
-		dodoc emacs/README*
-	fi
-
-	if use ncurses; then
-		docinto fep
-		dodoc fep/README*
-	fi
-}
-
-pkg_postinst() {
-	elog "New input method switcher has been introduced. You need to set"
-	elog
-	elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
-	elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
-	elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
-	elog
-	elog "If you would like to use uim-anthy as default input method, put"
-	elog "(define default-im-name 'anthy)"
-	elog "to your ~/.uim."
-	elog
-	elog "All input methods can be found by running uim-im-switcher-gtk, "
-	elog "uim-im-switcher-gtk3 or uim-im-switcher-qt5."
-
-	if use emacs; then
-		elisp-site-regen
-		elog
-		elog "uim is autoloaded with Emacs with a minimal set of features:"
-		elog "There is no keybinding defined to call it directly, so please"
-		elog "create one yourself and choose an input method."
-		elog "Integration with LEIM is not done with this ebuild, please have"
-		elog "a look at the documentation how to achieve this."
-	fi
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-}
diff --git a/app-i18n/unicode-cldr/Manifest b/app-i18n/unicode-cldr/Manifest
index be6743484409..fbf0eb6b8786 100644
--- a/app-i18n/unicode-cldr/Manifest
+++ b/app-i18n/unicode-cldr/Manifest
@@ -1,5 +1,3 @@
-DIST unicode-cldr-common-37.0.zip 25983328 BLAKE2B 6210d9f71cb57bc8e663eb51b2af552e30debdfeae206c2368e3ddafad723d1077cb0a2b2defb75170ef056f2d81d510e62761cbec2ed2071071e3859e7dd098 SHA512 b42e2c889b78d2ed774e2fb9f67cf3f9154aca57c5a966ea740fb7852c8c59e142f89764491f569c62d58f288e55176c8517674e2aefd2e9b8598eee3ba4307d
 DIST unicode-cldr-common-40.0.zip 28558521 BLAKE2B cc49a6471c9cb80abd7c2cf203547c14cea08fa2ac18a5f2b0cd4e7b3cfc48fcdb4491c1e9eb37ae398caed554661ad6957ef8e3b9c41b6a68b8afccd6e7a7a8 SHA512 b45ea381002210cf5963a2ba52fa45ee4e9b1e80ae1180bcecf61f431d64e4e0faba700b3d56a96a33355deab3abdb8bcbae9222b60a8ca85536476718175645
-EBUILD unicode-cldr-37.0.ebuild 532 BLAKE2B c2fd560e8f0b16dfdb51ed2690950d70655f9fad0554ed7cf174ce7a91a97af81cd2fc8e0b91cd543995c6babd1a395030d6b7e18f21fb8dd7182098dff1a52f SHA512 00a8a8a6a283578b50abb912fe8e599d597fbbabf0f9fe71ff241e7add5b2bf48662de3ee275be2ec6ec879a802f3f36da8df1d1e25212ff9c2cb688d18bd17f
-EBUILD unicode-cldr-40.0.ebuild 540 BLAKE2B 303ef479d588485e774732d4b8bb1c5a033410b278952dff105d2cb913698a3e4c046f78bae68142ea6866dbc8cba886df04dc1288dc0b6e69cce72ee84dc1a6 SHA512 2ffb65e7ca41eb4a3249c421224d9b639df359d93fe1151a6523a5259c092f2dc70c50f66f6ee10032f098a3491dc3b04e20d604c209043fb9e4dd598f5517c9
+EBUILD unicode-cldr-40.0.ebuild 539 BLAKE2B 149cb4f524f10bc984e1da517287ec0e9ad27b8f7c8e7df74f0695dc59596e0febe683892b326bfcbe1f69b8541956cef97c5b207b25c8984a927bd6c9cf6c81 SHA512 c94682f89e48c72eb60cbc6046da1e2e987bdfa3af9b2163568b50fd0c17e8cbd9c19384c46ce9f984836a309596cc3ddf3187bad654660f6f7e9ac7421a09f2
 MISC metadata.xml 259 BLAKE2B 473457dc1808c494d8a08c731bc36bc3f6fd42ac730b0e7372e9749275ad413c56abc214d6b8d43c3e3f3d878a81e61d3ac1088b0606e99b449018828f056c4c SHA512 42603797647a4e2bdd69fc8548c0f035143c2a94b836763b39fc0dda770621970fbb233327c142107bca40f48b2b380fe97c6517e5fce633ba2c11f7a34402fc
diff --git a/app-i18n/unicode-cldr/unicode-cldr-37.0.ebuild b/app-i18n/unicode-cldr/unicode-cldr-37.0.ebuild
deleted file mode 100644
index 073231a2bfa8..000000000000
--- a/app-i18n/unicode-cldr/unicode-cldr-37.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-DESCRIPTION="Unicode Common Locale Data Repository"
-HOMEPAGE="https://cldr.unicode.org/"
-SRC_URI="https://unicode.org/Public/${PN#*-}/${PV%.0}/${PN#*-}-common-${PV}.zip -> ${PN}-common-${PV}.zip"
-
-LICENSE="unicode"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE=""
-
-RDEPEND=""
-BDEPEND="app-arch/unzip"
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/${PN/-//}
-	doins -r common
-}
diff --git a/app-i18n/unicode-cldr/unicode-cldr-40.0.ebuild b/app-i18n/unicode-cldr/unicode-cldr-40.0.ebuild
index 816d2492b0e6..0f9768803de8 100644
--- a/app-i18n/unicode-cldr/unicode-cldr-40.0.ebuild
+++ b/app-i18n/unicode-cldr/unicode-cldr-40.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://unicode.org/Public/${PN#*-}/${PV%.0}/${PN#*-}-common-${PV}.zip
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-i18n/unicode-data/Manifest b/app-i18n/unicode-data/Manifest
index 9b9400f985f9..03f7f3df9f07 100644
--- a/app-i18n/unicode-data/Manifest
+++ b/app-i18n/unicode-data/Manifest
@@ -1,13 +1,4 @@
-DIST unicode-data-12.0.0-UCD.zip 8410561 BLAKE2B 10d34faaad501ddaba6de73a126b8dc5acc2941f81050ec4ff432f9a6aeabe1e13004e0ee190d37751517e3c2ea07c879d3bf2e39b8430d473f93f7fe05b08a8 SHA512 f9d845170df7e4952f90c6c75b256c2d330e174b95534fd6e8076bc6ad827a007b5e2b49562d29a4f7e6a529a41bb59330fb2acf94993f983049114d7b294a33
-DIST unicode-data-12.0.0-Unihan.zip 6749737 BLAKE2B a6caeb86f5c9dc13bc265c81acaa8ae791fdc8dbf728d3fba7a7004edcfbfa655424371cd4c9e667e1f1d6a5623b0ac1d320f0709c232b58b02494a728c7d2dd SHA512 7fdefad078284c14a9105655d1cb4d2b0dc1c89c56effe92ffcbd5a30b325559a56d97574b6077144d7a4ed02df6e6a402a2a5360e4abc0c84bae5c589044375
-DIST unicode-data-12.1.0-UCD.zip 8410738 BLAKE2B b635b449a04f3ffed8ec7311064cf2093cec5e7ebf8ec9a52b753a1c9a3f50374bdfe41a4e3e61bceefb69a847474b086b24a43f7f02de7183474737086f869f SHA512 68512627ecb75520b354160216cc14622c0d5321356f03429a102f734bddf6859c4ab266ed15db177dcbffd76c97d13d90de9a4fc38b10082a0e58fe3c82cda4
-DIST unicode-data-12.1.0-Unihan.zip 6749737 BLAKE2B a6caeb86f5c9dc13bc265c81acaa8ae791fdc8dbf728d3fba7a7004edcfbfa655424371cd4c9e667e1f1d6a5623b0ac1d320f0709c232b58b02494a728c7d2dd SHA512 7fdefad078284c14a9105655d1cb4d2b0dc1c89c56effe92ffcbd5a30b325559a56d97574b6077144d7a4ed02df6e6a402a2a5360e4abc0c84bae5c589044375
-DIST unicode-data-13.0.0-UCD.zip 7537310 BLAKE2B 5bcc8f010f81fea22cd0b5806ee190bbe9e58348c5cc3627141de3b1df5a00cbdcd800ebd0eb3bc0499b2c26920f6cadf42804b539e5be0aeeeb9eaee334a817 SHA512 aed6d06c370dd87bc5713e19ff4cde47b065b76a18149194fa843e4efc5269f749ec8905cad9132d3b803ab621a46e372052b8f3c3e9b6a65afa6516b0f2b4f2
-DIST unicode-data-13.0.0-Unihan.zip 7044963 BLAKE2B fffcd322c87c607e9e689bfef4ec79b4ec576b4ffd84465ed6d38f485ac4fccc7d0f46662f76dbb79630e070b12bf9e1530bbbd5b32c043b71f696018e1f3ad2 SHA512 87238202b5da069ab1bbc4672d86c6fd0711e354fb17f53b0b4152850c56c0fa09e6e45820ae52d49756b25fe696518ceaa34cbfe5366ff60688c9a5c3a2d5be
 DIST unicode-data-14.0.0-UCD.zip 6985828 BLAKE2B 2d36d35ded44fe1ad7966dae93e388c8c92d4404c811e495c0b4ea1c6482c4ed1488dff37b608cae230163bc4dd66cf8ec40d5db6e60541cd7719673c91dc5b1 SHA512 17fbfb3ebd3a75227526d87e19feb70c1b0ccee656e421e955aadc88847ed2597437eb8cf19619e2a49470d286b285e219aec18d6b29dab47cfa8317a212b458
 DIST unicode-data-14.0.0-Unihan.zip 7116482 BLAKE2B feafb77e8a1694efe940be226735f88c2e08be43408b8c12de87b86860d3cfacffb3d7d287e4fbf6b7fcef1055f3fe6b74f312312dd7d1886cbc7a394a7df983 SHA512 1827e512dd1bd27f3553746275dc90e3c3add38590d56da3901eccb56b94fee9e2dd806514a866ca73dfe4770ec585d200a6b6a7a4293c2ff572a2f5b50ef091
-EBUILD unicode-data-12.0.0.ebuild 760 BLAKE2B beefa6fc74ff1a1321714103d948ff3fb24fa07d0d65bb3c75b3e48cd08ce151f3eaf85dd14bbdf3507b6bab4a899df3929ff77d7d5eddc7f5927f2620db1c27 SHA512 a62eca3cfde5f97e9c016aa9849e89fc0b7971af60584373bf074c97563d7aee14fef58f909f0c4891f1b16206a99a8219b6d916ab0ccfe435ed83de62f77760
-EBUILD unicode-data-12.1.0.ebuild 771 BLAKE2B dd6af401676af571b01d33c42fda0f30e3408a7781864eb31f7c34e8aac77f773df526192bfd7d8f8c2dac938f4f2beb90b4b1d55fa674efe9080668e60cf246 SHA512 bd35048a1ab835ec7ae8d3917cb988cb73aa2625f9e95a351d22b5c33a8429afdec1e48a8f82c6be4ca2b201ccc638d1fc0ccea10647c9861dec26a21797041c
-EBUILD unicode-data-13.0.0.ebuild 777 BLAKE2B 3e8ce9f469bf9026d880f75f7ec4287813c27ab138f041c539c3b715a045952eed45904be7be0fea4734c83e21f7d49f41abe9536194d965a2ecef61471e0469 SHA512 c29f7dd4ae672847fccad92f5491af35789e1a45320539ede246cf8238864947435be187c40bd3569f5f6f833abb1c0a8811754b4dc73b3d7ded9b4c1e495149
 EBUILD unicode-data-14.0.0.ebuild 763 BLAKE2B cf52c10dcd43ec8b03f5007362dc33653cca706c1ebeca6e7a1259e8d8e76aaf5130ff749539f51ec0579cff9a2b63374c77f826e5efd3165e6b23c48054448a SHA512 812ee2d9bfe960657e25e4f8cc47e0cfa6cfb377334ab24cc5dbd4262981367da64f37c505ede5f11e773654444c222698d5a7f05d167c71a53438616ab503c2
 MISC metadata.xml 348 BLAKE2B db346dadc3a3333cdd52371d751f814244a22770e00306f9e53b6ca4a70b6dabd107e1c8d62b2fb2b333ce60db28f4b8f8f900ffdce07aba4246e2eef16563a4 SHA512 a6b846e15f4b2903ebe245954bdee3c7c5adfedd0f6d0a05c32defc8cd6f35df804c11567af92911400626fd846320d2338175c1921821adce1db04d5c40dc6a
diff --git a/app-i18n/unicode-data/unicode-data-12.0.0.ebuild b/app-i18n/unicode-data/unicode-data-12.0.0.ebuild
deleted file mode 100644
index 90545a676bfe..000000000000
--- a/app-i18n/unicode-data/unicode-data-12.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Unicode data from unicode.org"
-HOMEPAGE="http://www.unicode.org/ucd/"
-SRC_URI="http://www.unicode.org/Public/zipped/${PV}/UCD.zip -> ${P}-UCD.zip
-	http://www.unicode.org/Public/zipped/${PV}/Unihan.zip -> ${P}-Unihan.zip"
-
-LICENSE="unicode"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	# Unihan.zip needs to be installed as a zip for reverse deps
-	# https://bugzilla.gnome.org/show_bug.cgi?id=768210
-	unpack ${P}-UCD.zip
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r "${S}"/*
-	newins "${DISTDIR}"/${P}-Unihan.zip Unihan.zip
-}
diff --git a/app-i18n/unicode-data/unicode-data-12.1.0.ebuild b/app-i18n/unicode-data/unicode-data-12.1.0.ebuild
deleted file mode 100644
index d5f7f27ee193..000000000000
--- a/app-i18n/unicode-data/unicode-data-12.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Unicode data from unicode.org"
-HOMEPAGE="https://www.unicode.org/ucd/"
-SRC_URI="https://www.unicode.org/Public/zipped/${PV}/UCD.zip -> ${P}-UCD.zip
-	https://www.unicode.org/Public/zipped/${PV}/Unihan.zip -> ${P}-Unihan.zip"
-
-LICENSE="unicode"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	# Unihan.zip needs to be installed as a zip for reverse deps
-	# https://bugzilla.gnome.org/show_bug.cgi?id=768210
-	unpack ${P}-UCD.zip
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r "${S}"/*
-	newins "${DISTDIR}"/${P}-Unihan.zip Unihan.zip
-}
diff --git a/app-i18n/unicode-data/unicode-data-13.0.0.ebuild b/app-i18n/unicode-data/unicode-data-13.0.0.ebuild
deleted file mode 100644
index 51dd6ec58bcb..000000000000
--- a/app-i18n/unicode-data/unicode-data-13.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="Unicode data from unicode.org"
-HOMEPAGE="https://unicode.org/ucd/"
-SRC_URI="https://unicode.org/Public/zipped/${PV}/UCD.zip -> ${P}-UCD.zip
-	https://unicode.org/Public/zipped/${PV}/Unihan.zip -> ${P}-Unihan.zip"
-
-LICENSE="unicode"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-S="${WORKDIR}"
-
-src_unpack() {
-	# Unihan.zip needs to be installed as a zip for reverse deps
-	# https://bugzilla.gnome.org/show_bug.cgi?id=768210
-	unpack ${P}-UCD.zip
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r "${S}"/*
-	newins "${DISTDIR}"/${P}-Unihan.zip Unihan.zip
-}
diff --git a/app-i18n/unicode-emoji/Manifest b/app-i18n/unicode-emoji/Manifest
index f4ec028de2f3..46560f54ae3b 100644
--- a/app-i18n/unicode-emoji/Manifest
+++ b/app-i18n/unicode-emoji/Manifest
@@ -1,13 +1,7 @@
-DIST unicode-emoji-data-13.0.txt 105959 BLAKE2B 6cfbc3170f8ef990ece1f1ae9e923ac4a753dc2c2d949e5bc82c2afb0bb12a90eb4e2dcd505666b8cadc91c42f6ca9c6bec3293fecafdacf911a885b0cc42468 SHA512 7b6f838a5b863b070cdf4289a8b7a2e6f07e5af8c6614aa58b4179658f7d73161615c3c4757464585d1e9d73d307e0a60fd6621900aa9e88365d8c03729780d0
 DIST unicode-emoji-data-14.0.txt 109396 BLAKE2B f4268938ef60de5200f78856c6a0886a463d6c3c0de9bb3220f58328aa53c709dc4fd79f5d2f607bd5b07f46100026fb08f4a413803d5d3720fd61dc75d708fb SHA512 364dc7413a1ab959e886f787450071dd8d139ec3d2dc8ca382c700661d93002a4406511e74de27f3cf7b9db793e8a3b48649128e786b20c02cd710350e07c8ca
-DIST unicode-emoji-sequences-13.0.txt 178671 BLAKE2B e391c53f8737fe7e9d8b002e61471afd903859ed9c5ca8035b04fa1c31d3f199b443e39ba7996604c606c5c46f2d9ff521d40af85e0b7c493bfcc784e2e61af3 SHA512 65f4fdaf6f2038d34f645220a0306036244dba69aeba0a44939584c18ad8e0488cb612f07e17cdb1ffea3d8d2fe3e54ed2e134855c3dc615730fd14cd297a9a3
 DIST unicode-emoji-sequences-14.0.txt 188859 BLAKE2B 40dd76c52c329b5c0296a72d3f92bf41a55d63a57f094b49d449ee3624b7275562575e76fd5cc877c17ccab9923cd07538e4370615b8f05324706d3c861285e8 SHA512 527a763fe43e4679b7a689c2b736a4cba9a76ebdd601a0550992391d98431a5248ebec3ba35b20e8bd34cfb3075bad399825371c8f11ffe78e12e0fe09bbc181
-DIST unicode-emoji-test-13.0.txt 453143 BLAKE2B 3effaedbd7f37c0bc1d3aa122b0240c4dbf981b05bed83b6bb6523a1680900c64ff27edd1dc14d14d072a8631176f5fab5ed0166bbead6944d5b89e9729d6c75 SHA512 6da82936f1eb92e5d31a4e815204e17119011408d746c60c3ecd700c8039389d7c790c8ea6b8ec2828aadd863b923f0d3861a42a1f6b5ecdbbb19d2f5f81ea56
 DIST unicode-emoji-test-14.0.txt 589717 BLAKE2B 2413d55c386607a88114cfeab5805476ba676a480a7d4de99eaecc7c6e825d883ab6e1217a2e0cd33ab951ae2f39a6b3547fdaace31bcf6985113d42b4e5f9b7 SHA512 693fe5c225e28a694d7aa436d3c6546c3376854878bb92d15f1c88b2d6ce3e9f67ddf66bd08e6aa99930d2965a28f8ed4dd3a895fdf5311abb0a323de27e1a12
-DIST unicode-emoji-variation-sequences-13.0.txt 36485 BLAKE2B 81a7ee549a209aa1cfc0c0c941c9163c35da357541d8a234be26d18df1abbc8db8b62577c6aa15699b0b173497374a4a4fa1f7d23a9d2698f33ba0ea7d3a1b03 SHA512 7edaf7c4df3eb34aa208ae5688a59220d125d3eb262b750493e758584d92ab3dfb3eee23a9e31c50902f4513a5a91e6cee5708bc16d052a568bd7b355573895c
 DIST unicode-emoji-variation-sequences-14.0.txt 36547 BLAKE2B fa63c1924a00026489465f6a949b1124661fbd1877baaf10560424f8fdd59289947f2759e7873632f644b14213e1309601e764c1545e25ee9b94aea2ea813848 SHA512 d54dc787796609546140d1d730ce3574afe15a6dc4c947d171929df96a1189f5e65c8335d2c7429c06d8a9abe20a3f6332e551629e9808fd1e7f5b2ed6cbc24e
-DIST unicode-emoji-zwj-sequences-13.0.txt 189608 BLAKE2B 759c8c0763ed88a9ebbf40a8ef1046537773cae3043186aded7089ca3052a5c6d6baba3c30f00df57dcab0a83d46323a0c1e8551db63c3329610c641646a388a SHA512 a0b04ca2732acd33c7ea9a2929ef5d60080dfeb4b1b452e853486e57663518773af4e863b239dd2bd6f5e78ce2a7e828898757ca4adc82134da370111c3e0272
 DIST unicode-emoji-zwj-sequences-14.0.txt 231001 BLAKE2B faf8389549d9977ac87605af8c209d340261c4a14adec9932bdf41690997730c8dfb3a3261fcbca8b4c24f5f20ed8e3355330049c850680b4159afa73e935b01 SHA512 f1098393fbea76ece6838b509b985f06d92ac3f3ee0a0faf14cc92dc1dce73c3d3b7517fb940d48de27243141568acac88bb5b4438ead445cec9434826932e59
-EBUILD unicode-emoji-13.0.ebuild 964 BLAKE2B 7bbf8148b33fcea858156797c7f780c40408282591b1c16e00e95d2b51a2d7de6e319ec73097b7c2b87d41d8714a65ff75ebe4150c80a68bdcaf07abcd754ca6 SHA512 54538536034a1e4b89e7c677e10f7aa5b25e6d0cf5e2953a8a9fea5328ad487576bb7791072ee5927ae24926d7f96c5fd2c197fec5580b429d0a1faa3c5ce4cf
-EBUILD unicode-emoji-14.0.ebuild 972 BLAKE2B 99cacefe272e14c3e46f07ce7460db87190fa7590d0ddf80551996f3ad78792705862b50317fab9ea2db6107710f04d8edb72426a4256c3bf7a5885abd0b811b SHA512 c273aea0d295a22cdf2fed5d00a41b09d1c06fda0f1d7f17a65f15eb38654c1e7b6ce57a60743aa88199cd6f3b1278a25630abd3d146d15ea0b1ce6f2405ebe7
+EBUILD unicode-emoji-14.0.ebuild 971 BLAKE2B 3da09a2a7c100be47875d8cac35026bd8f39b4996d44dfb7d486efae4dab9eb8b5ef011a6f7e5dcf74125db252d860801cc4c076fbbf4b96d255490a532806eb SHA512 199f640ddc824aeed4be7a13d503f74162472834bdd6b3ca49cdb43bef7bc29fb171e409fe2722c2893cdf5b6d054965057d0c92a7e25289e4be17c2df7a5895
 MISC metadata.xml 259 BLAKE2B 473457dc1808c494d8a08c731bc36bc3f6fd42ac730b0e7372e9749275ad413c56abc214d6b8d43c3e3f3d878a81e61d3ac1088b0606e99b449018828f056c4c SHA512 42603797647a4e2bdd69fc8548c0f035143c2a94b836763b39fc0dda770621970fbb233327c142107bca40f48b2b380fe97c6517e5fce633ba2c11f7a34402fc
diff --git a/app-i18n/unicode-emoji/unicode-emoji-13.0.ebuild b/app-i18n/unicode-emoji/unicode-emoji-13.0.ebuild
deleted file mode 100644
index 2d7249e1c3b1..000000000000
--- a/app-i18n/unicode-emoji/unicode-emoji-13.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-DESCRIPTION="UTS #51 Unicode Emoji"
-HOMEPAGE="https://unicode.org/emoji/techindex.html"
-DATA_URI="https://unicode.org/Public/${PN#*-}/${PV}"
-UCD_URI="https://unicode.org/Public/${PV}.0/ucd/${PN#*-}"
-SRC_URI="${DATA_URI}/${PN#*-}-sequences.txt -> ${PN}-sequences-${PV}.txt
-	${DATA_URI}/${PN#*-}-test.txt -> ${PN}-test-${PV}.txt
-	${DATA_URI}/${PN#*-}-zwj-sequences.txt -> ${PN}-zwj-sequences-${PV}.txt
-	${UCD_URI}/${PN#*-}-data.txt -> ${PN}-data-${PV}.txt
-	${UCD_URI}/${PN#*-}-variation-sequences.txt -> ${PN}-variation-sequences-${PV}.txt"
-
-LICENSE="unicode"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE=""
-
-RDEPEND=""
-S="${WORKDIR}"
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	local a
-	insinto /usr/share/${PN/-//}
-	for a in ${A}; do
-		newins "${DISTDIR}"/${a} $(echo ${a} | sed "s/${PN%-*}-\(.*\)-${PV}/\1/")
-	done
-}
diff --git a/app-i18n/unicode-emoji/unicode-emoji-14.0.ebuild b/app-i18n/unicode-emoji/unicode-emoji-14.0.ebuild
index b413949fb1ba..a5d60ffa357e 100644
--- a/app-i18n/unicode-emoji/unicode-emoji-14.0.ebuild
+++ b/app-i18n/unicode-emoji/unicode-emoji-14.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${DATA_URI}/${PN#*-}-sequences.txt -> ${PN}-sequences-${PV}.txt
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-i18n/xvnkb/Manifest b/app-i18n/xvnkb/Manifest
index 73905c639db1..4693ae739813 100644
--- a/app-i18n/xvnkb/Manifest
+++ b/app-i18n/xvnkb/Manifest
@@ -1,8 +1,5 @@
 AUX xvnkb-0.2.11-ldflags.patch 1077 BLAKE2B a1302da0f64a8975d4c88c63ce80e21b43d656d0766940ada495509649f890f917cb7dbc78a874a2854ee6d096e3ef6cd4a582f52f48913fd5c618a5767187e5 SHA512 8e64e433b4d05c30579f61f38ebb2d3d8f96ef620ddee7da62196a480fcfaf03595058f7dbf53d25948b89c534eefb89e61e62a5bea54edaa9601fe299642ed3
-AUX xvnkb-0.2.9a-ldflags.patch 1065 BLAKE2B 9a1fdc685b0451c06acb5a66b85c632876bd6b542f61a66be4d9c4d502a4e96336eb4d81d707e0248940372681d70683f5192f6b07d30e6934b71c759f05b12d SHA512 34a526e4732ed63a308a5dc37a7dde762512598619e8c7e3258cc0a58e3c95cee2ee2baee8c91646683e738e7b5542c6696467d0b0f16f82f07fa3c5b0a842a5
 AUX xvnkb-cc.patch 217 BLAKE2B e33d60d26bef4c34f8f1e40a923ed3f1f759211965a6ecb66d8b257cdd2100112ab005899e208d0c89df63f38dac42bd215721d913a5dcad763a5dac2905fe7f SHA512 e5696260fb5e70e0c9d85b3d3686eb7f3f62df68b27d78e77bcecbf0177afeeaf805df0c71eb4f8a9c7209def0caf9cff096a515efd9812473f9848e8cce095f
 DIST xvnkb-0.2.11.tar.bz2 76397 BLAKE2B 8ebe4c389f5174b74af32fb001ef5f94d388b16a7c1ca0f409faffc6d63a4543d4daf7dc3609a8e7066324280eaf2d980e4a4e379ae478010269b808effb61cd SHA512 10d24ec159a89dd5fa68540bb8a92ae4d925f11039e7a7b77ed273862e4eb28ccd66d53ca1d0304f2a6d38182eddd304362d2bfd8c6804a2e7bfb354b20e5e83
-DIST xvnkb-0.2.9a.tar.bz2 76429 BLAKE2B 33205bfe8dcc2fd68eaffb507dfb2db55cc1a71d33765f807b3804091a29f8c34ca8dcaf65a3f3978da921534d054096fb22abded3c4829d5ca256d3e51fff34 SHA512 3dbf4adb65f321d721fc74e05e92d2d1460e63c49e8a1ab2e10ab9f015e1a57bd3e641645d1283f1d0c5592eb7b342bf210d9fcab9ba441b6416c2f8fd1af6da
-EBUILD xvnkb-0.2.11.ebuild 1336 BLAKE2B a5b33a86e3d79721978adc05498712829993fad0ff1567ff69bab1c39d282fd593dcfe105e4e1e7df0d9f940e778fcea302d9395b0bc7078ea3b4d65f7e38237 SHA512 5e436876c8ad58a8271a32f252317019a5ac1c9ded83c6877cdeebc3fa49c47dbcd7c6313e7d409fcd9d11d295be9c9555e775a11fa2824454d4e0611b44604c
-EBUILD xvnkb-0.2.9a-r1.ebuild 1335 BLAKE2B 5363f8b9ba2b09385d8b843bf9714a6a65aaad3029d8def9bcd590abbee5cc5cbf709b754d91cbb117ce9d566459e56d1b9ae175b47e34829ad013543050f6e0 SHA512 ce4cfadb50f778dd0ac9f915cb49dc8c8605e7ae906e07cf6eef0ad4bd1b16541ee547a755402e8709818ff23cb898e9152d7f70348a9d2fba0fa1d320f26a85
+EBUILD xvnkb-0.2.11.ebuild 1335 BLAKE2B 2c2b48628b0e2514c0a64789a39f6cb3e1554b9d3ec994d77d4d1738cd6b214859a3b7144b20bf1ab1f7b1ba10e9b6cb2c5c8f09ac2ec083983ed83bcda2870b SHA512 81d363127a657e3505722f2a8217f365da9ad44cc22340950506b62ce89094857b916da3612ca7404588718884f0f304c00bf99ea17603de81c0a1ec456a53ba
 MISC metadata.xml 310 BLAKE2B 8cc6252010668c0621159f3bfc8be62a27e75a6798aeab86824ca9670f10844199aa1960c93d4b3d0f6b614595c00e26126f280cde4ed1d253ac17de74864ab1 SHA512 3ae9cfe5184876f5754768c37e25425b1067fd53e1fdc16cfc19508cf7d4845ff47f6f7f0d7752a532e2f4c8f74ca7abb16ec69db00bfec78ba6aa25872663f0
diff --git a/app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch b/app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch
deleted file mode 100644
index b954b2914178..000000000000
--- a/app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/Makefile.common
-+++ b/Makefile.common
-@@ -19,10 +19,10 @@
- 	$(CC) -fpic $(CFLAGS) $(FPTR) $(VK_OPT) -DVERSION=\"$(VERSION)\" -Wall -I$(XLIB_INC) -c $<
- 
- $(CORE): $(CORE_OBJS)
--	$(CC) $(CFLAGS) $(DLFLAGS) $(CORE_OBJS) -o $@ -L$(XLIB_PATH) $(LIBDL)
-+	$(CC) $(CFLAGS) $(DLFLAGS) $(CORE_OBJS) -o $@ -L$(XLIB_PATH) $(LIBDL) $(LDFLAGS)
- 
- $(GUI): $(GUI_OBJS)
--	$(CC) $(CFLAGS) $(GUI_OBJS) -o $@ -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS)
-+	$(CC) $(CFLAGS) $(GUI_OBJS) -o $@ -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS) $(LDFLAGS)
- 
- main: $(CORE) $(GUI)
- 	@echo >/dev/null
---- a/tools/Makefile.common
-+++ b/tools/Makefile.common
-@@ -16,10 +16,10 @@
- 	$(CC) $(CFLAGS) $(DEFS) -Wall -I$(XLIB_INC) -c $<
- 
- xvnkb_ctrl: $(CONTROL_OBJS)
--	$(CC) $(CFLAGS) -o $@ $(CONTROL_OBJS) -L$(XLIB_PATH) $(LIBS)
-+	$(CC) $(CFLAGS) -o $@ $(CONTROL_OBJS) -L$(XLIB_PATH) $(LIBS) $(LDFLAGS)
- 
- xvnkb_setup: $(SETUP_OBJS)
--	$(CC) $(CFLAGS) -o $@ $(SETUP_OBJS) -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS)
-+	$(CC) $(CFLAGS) -o $@ $(SETUP_OBJS) -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS) $(LDFLAGS)
- 
- main-tools: $(TOOLS)
- 
diff --git a/app-i18n/xvnkb/xvnkb-0.2.11.ebuild b/app-i18n/xvnkb/xvnkb-0.2.11.ebuild
index 6442bca8677d..5493f9d719bf 100644
--- a/app-i18n/xvnkb/xvnkb-0.2.11.ebuild
+++ b/app-i18n/xvnkb/xvnkb-0.2.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.sourceforge.net/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="spell xft"
 
 RDEPEND="x11-libs/libX11:=
diff --git a/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild b/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
deleted file mode 100644
index 5281e3024429..000000000000
--- a/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Vietnamese input keyboard for X"
-HOMEPAGE="http://xvnkb.sourceforge.net/"
-SRC_URI="http://${PN}.sourceforge.net/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="spell xft"
-
-RDEPEND="x11-libs/libX11:=
-	xft? ( x11-libs/libXft:= )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="xft? ( virtual/pkgconfig )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-cc.patch
-	"${FILESDIR}"/${P}-ldflags.patch
-)
-
-src_prepare() {
-	default
-	tc-export CC
-}
-
-src_configure() {
-	# *not* autotools
-	./configure \
-		$(usex spell '' '--no-spellcheck') \
-		$(usex xft '' '--no-xft') \
-		--use-extstroke \
-		|| die "./configure failed"
-}
-
-src_install() {
-	dobin ${PN}
-	dobin tools/${PN}_ctrl
-
-	dolib.so ${PN}.so.${PV}
-	dosym ${PN}.so.${PV} /usr/$(get_libdir)/${PN}.so
-
-	einstalldocs
-	dodoc -r doc/. scripts contrib
-}
-
-pkg_postinst() {
-	elog "Remember to"
-	elog "$ export LANG=en_US.UTF-8"
-	elog "(or any other UTF-8 locale) and"
-	elog "$ export LD_PRELOAD=/usr/$(get_libdir)/${PN}.so"
-	elog "before starting X Window"
-	elog "More documents are in ${EROOT}/usr/share/doc/${PF}"
-
-	ewarn "Programs with suid/sgid will have LD_PRELOAD cleared"
-	ewarn "You have to unset suid/sgid to use with ${PN}"
-}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 8c45e1fa59e0..7dabdddd1b52 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index 3a54592dd637..a067009beef8 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1,3 +1,5 @@
 DIST lesspipe-2.05.tar.gz 167135 BLAKE2B 6f54a68a3857fcafa19148ba798d6ac49b2693e547e88a4a4fb6a178768d75ba8ae08e808a9e08aabfe903538bd401e3bd25e22ec240bf3a52365df729d87b9e SHA512 b4220b28fb609060735663067f5a738cae32d12e90efc397db3749e4dcfa7bfc063a4458c1f39b8a43be3b04effdc00a25c4feebd6e9a3b23f0064b879bbb698
+DIST lesspipe-2.06.tar.gz 168100 BLAKE2B a7447efa85cd422343f9dbb06001e85fa7b33c92db752f8248e4b4a0d9ecce4ef0241240d6993c5a71157c44da2f4ffc3efd41ac5e0a31e89ed5b80ac99f71fe SHA512 b2411c5e6b287fb67e1ea9b6d10377fe19b58e8c0f54587f825d1ee4c1a85f9a8ed3244a7cf339bcba960094e95821d9a56929951d862eb697f1d12fe55ef20d
 EBUILD lesspipe-2.05.ebuild 1239 BLAKE2B 2265355eb134120872f08556c2835d08326842fd6e988cc5db9dbee8646370997c4499b2e7275637904ffef8ac836e7766a294a900a10d5a36a36309e6ca6c91 SHA512 b294b4a0aad7a1d20eefd74c93494fe73248b1e75710219575f70a5c6203da3c8a1db0b8e28f6b5f1c18e415238005546f6c87218a87fd038ffa66c664fcae7b
+EBUILD lesspipe-2.06.ebuild 1318 BLAKE2B 28c664aad8277a4a49d1cc432f255738156ef98b6268d362c3d583bd3f34b868ce6a02487aee8c3b53aa2dfcbeaf22271e336ae1dccdb9639f17dc0367fe69cc SHA512 3b7fb6d9d7216648e5c8b02553bd87a729639f7293c9b5dab51dc9a69dd5741bef81ed54739d593effa1b7305779bee67e83b6c4604488e885e1fce31756035f
 MISC metadata.xml 304 BLAKE2B bb5be96b5fd22ce82d800f6bd5ed3ceb04b955182eaadc1f34b6f4b633c21efd6148013fc29b5567f7ada4da5de6efd7e0e420fa63a2976a5cf6bcf719c34f2e SHA512 2c217e67c6c487f7f7f98588a50086daf434bc25ad229b68d37bc12f7ecc4f904b5bc4a3b7b6db4a1daa0267c7e13fde8538de1c16d11e95be6b8071ee675105
diff --git a/app-text/lesspipe/lesspipe-2.06.ebuild b/app-text/lesspipe/lesspipe-2.06.ebuild
new file mode 100644
index 000000000000..b16b5f900cda
--- /dev/null
+++ b/app-text/lesspipe/lesspipe-2.06.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1
+
+DESCRIPTION="A preprocessor for less"
+HOMEPAGE="https://github.com/wofr06/lesspipe"
+SRC_URI="https://github.com/wofr06/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+# Please check again on bumps!
+# bug #734896
+RESTRICT="!test? ( test ) test"
+
+RDEPEND="dev-lang/perl"
+BDEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	test? ( app-editors/vim )
+"
+
+src_configure() {
+	# Not an autoconf script.
+	./configure --fixed || die
+}
+
+src_compile() {
+	# Nothing to build (avoids the "all" target)
+	:
+}
+
+src_install() {
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
+	einstalldocs
+
+	rm -r "${ED}"/etc/bashcompletion.d || die
+	newbashcomp less_completion less
+}
+
+pkg_preinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
+		elog "The latter is the Gentoo-specific version.  Make sure to update your"
+		elog "LESSOPEN environment variable if you wish to use this copy."
+	fi
+}
diff --git a/app-text/lv/Manifest b/app-text/lv/Manifest
index 7fc3484e8f5c..0bd3167bdba5 100644
--- a/app-text/lv/Manifest
+++ b/app-text/lv/Manifest
@@ -3,6 +3,5 @@ AUX lv-headers.patch 725 BLAKE2B 64a570d256aae0e5d3c13c2c6a51c2311da1dff3057219f
 AUX lv-tinfo.patch 629 BLAKE2B 1923de4cb256d6752561f2489d1633a01987e4ad073bd28fcafcd2ab81c68a2ea8a4a278a0c4a8c1c09df581f0391fb2c469c65144ddf5d7975ba1b8b9ae5555 SHA512 3a33edf5ad11d77cd23bd27fbe071aacf83ec5367b100103954159a0dc4ba2856f3978d3b8c7f41c52006dc99097bdd9d127419f700d75cbb88b745ffe4694e0
 AUX lv-xz.patch 1415 BLAKE2B e4a9cbd5bb2ca71eb3c6eea8e132caf2f1bbfda84e8055654eac86948b7f0e57397af96beca2eeacf259f9258aafa5d03303a202ab5562236ba05f0adf22cfa7 SHA512 eb791a2e392070a01e372bbc6d0d4bc113fbb57394e50fb7a55e46ee4b0896177fdb1698db750b43e78b6aa120d0fef34ad4859fee5d4a1749c062a7afb6ec84
 DIST lv451.tar.gz 605082 BLAKE2B cbfdf1c4c90dc746de631e55e3d1e88335f22342991ca7d5bd4b3661803af4efc0c6dcd821ea58be6024fa7ce773ffaa0aa3844350b6f67dd61be09e2475cb70 SHA512 88c05cb06ddc56e7f16f30b38218ec3bf9c8ef6c3c2b08d5a3f950b6870b82417368ada3f14f183b0feb6ed32d144d71901ad8134e5f88ddec11fc7b9520e810
-EBUILD lv-4.51-r4.ebuild 983 BLAKE2B 5b4fed1290923c58644aebe7b148f95acc4c02288c688f7127e1805d088a28533f80efd98fe7a02cf96e1c27f14629b4d835c5e90f81c2c91e8f2b4431f9f0a6 SHA512 5f7829327895e7681c91b35caaf2d42fc748adc1d3788f4363939e205b959b561ae57493416c548621e761716393e86b2dd1df0f2b649c2e43bfce1cdd8d3228
-EBUILD lv-4.51-r5.ebuild 932 BLAKE2B 173880a7c442d0b99e2117f7a34277ce2517d7701a253c838189feaf230382421aceaa155fc5c3b33e731ecd372ae95096e316b02da9dcde4ea3ca1457b6be6f SHA512 908ccad46f4a386d5b47a1532e9df2ddbabfa2ed976f915717fa2844dff83b268b82663f9d413d1eb95efeb5b173818b704053fa07932d72dc5269d0337df5fc
+EBUILD lv-4.51-r5.ebuild 931 BLAKE2B b776cac1368ca193fbf4f0faf29418a8dbd4bfa18e7cc7b7fe360fae9f63df2d09caef4b4dff414d21708ef3483b9a93b0fb3e2903be84096be524fb10d0eb22 SHA512 ab3be825da552f38e49ec87c3debdb0fffc06c7253defebbf816a5ae788ac1e43e0369e0bde7e74e96950ba52e1be5cd16163ee21dcaa53d62a004248d936525
 MISC metadata.xml 241 BLAKE2B d06d8c9218cb9736ecc414504678e9bff30ba6bffbd2b357e9a2ea990df4e73a21b8ad4db267eddfdbf73e8501dabe5a748c4ea9d26906d39425ab744b320216 SHA512 cff6b46a252b531091d1ef597e3f714f98d2ef4aa621662d8c2ec15e4f990cd811300d3439e1be003bd307d0c8d12e78f34cf7fd49f6d006d9362f0e6ccf6252
diff --git a/app-text/lv/lv-4.51-r4.ebuild b/app-text/lv/lv-4.51-r4.ebuild
deleted file mode 100644
index 065e2cd8201a..000000000000
--- a/app-text/lv/lv-4.51-r4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools toolchain-funcs
-
-MY_P="${PN}${PV//./}"
-
-DESCRIPTION="Powerful Multilingual File Viewer"
-#HOMEPAGE="http://www.ff.iij4u.or.jp/~nrt/lv/"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND="!app-editors/levee
-	sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-gentoo.patch
-	"${FILESDIR}"/${PN}-headers.patch
-	"${FILESDIR}"/${PN}-tinfo.patch
-	"${FILESDIR}"/${PN}-xz.patch
-)
-DOCS=( README hello.sample )
-HTML_DOCS=( index.html relnote.html hello.sample.gif )
-
-src_prepare() {
-	default
-
-	cd src
-	mv configure.{in,ac}
-	eautoreconf
-}
-
-src_configure() {
-	ECONF_SOURCE=src econf
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
diff --git a/app-text/lv/lv-4.51-r5.ebuild b/app-text/lv/lv-4.51-r5.ebuild
index 79220d164914..58fee6c0a2bb 100644
--- a/app-text/lv/lv-4.51-r5.ebuild
+++ b/app-text/lv/lv-4.51-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="!app-editors/levee
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
index 8afb82f37d04..624b17c49e29 100644
--- a/app-text/xdvik/Manifest
+++ b/app-text/xdvik/Manifest
@@ -1,6 +1,5 @@
 AUX xdvik-22.87.03-freetype2-config.patch 1019 BLAKE2B a675a238fb147dcb67eda572b9a3b1e1b1ab630726464eb740240be0815b9a9da5e5f7a8a6d404648f060995c64efb02acbb67fc907dd6139c6817f0bdb5a946 SHA512 be5b7de6957c5bb2ad884e5b3a6a21f074b84b6be08f519b80a24dacd8630b2bc75dc64e225dba388d17a01bfed6784b2862db2e6bab4b73a1f6d4aebf23a9c6
 AUX xdvik.xpm 3125 BLAKE2B 97990fbd5b22e51319c3f55bfe16808b01f215a92185a170620c8c0ef1dc44906e38af48ad056d4fb40a1777f92a88afaa0f80c0b36e7dd770954f7009d261a3 SHA512 697c888c481d7cbe7b42980d2ae93a8d25d781f926970d9040f8fbc6a37545349fbdbe2e8c98fb686e5a5ebe9a7a5ff661793d3a264fd8641182b0397365517d
 DIST xdvik-22.87.03.tar.gz 4760306 BLAKE2B d242696fadf2980cd307d4a172d2af06d98d07b090279440117f869c9a623bcade8745d7a4d3c108c4eafbdeaadefb8d5ba1ea00bdf77d350cbf83c49c2ca0fb SHA512 d4d418d78658f16d4d278e387ed484b291afc8623b00acaf4110e9f123ed76568714ad50f80588373657f412e8fff36f3e76b3e43f69756d46f031c0f2269a88
-EBUILD xdvik-22.87.03-r3.ebuild 2905 BLAKE2B d3534e59c513372e72eaf48ed34b09b89542688deab3d03a22bbae30c45b991dd91a9fdcdc728a34ac1c0ff23572810e78731636893821d4aa779226f67205f4 SHA512 f871231eb081e65bf03dfcbdc9c09cc561a74074a806477132d5cd1ffff37fbc70aa62bfb15eba6978a49449ee78e5ba05d45ef5e20070ce23f0089478ffa989
-EBUILD xdvik-22.87.03-r4.ebuild 2842 BLAKE2B 328696c0f590562b8c71de725d226a1229560e00acd1b5d722b8cb374411e5d2d01abb3561f390bd7aa82a0d8ef18bb775c3a210d89646c37028b6642e9635b2 SHA512 0e171572e02d6fe9d037d00929c55aa127cc184ed5e8d98157081d1b7caa3806157fcf42b1613e9a9328060cc99ec1751259819af28d29f4df2cd4aa6af4e6b9
+EBUILD xdvik-22.87.03-r4.ebuild 2841 BLAKE2B 6bbf63451530616fea81800bfb65fb2f7c50972f3a6d93afd4cfeb99693c076731fc8ce68e4d9eff6edf1304b3cd20708d7c38c0ad44dae5646222e617c98208 SHA512 e1ba6154380b06671fe9fced1367d3ab46c0b2a77edae1dc10a3da88e53e7f4be390a4e0626fdc917e0943e2f8a274d3012cee1f8e6f42880e9a1da3a9270069
 MISC metadata.xml 595 BLAKE2B 200debd0214e5985f3f59cabdac72252b556edef5224c77f5dbd91de347f57ab492dd0f7ce846c335179344bc9215b02af61572ff859c9c44ca947235ce5062b SHA512 bf925b9c9738c62f26ebbb2f88782597d6cee471a19258b553e0dc7aa397443149adfceba6cfcdd045196eecc3319541b980850ba5e572f51266da1945b65e4a
diff --git a/app-text/xdvik/xdvik-22.87.03-r3.ebuild b/app-text/xdvik/xdvik-22.87.03-r3.ebuild
deleted file mode 100644
index 6ae5639b5531..000000000000
--- a/app-text/xdvik/xdvik-22.87.03-r3.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools desktop elisp-common flag-o-matic toolchain-funcs xdg-utils
-
-DESCRIPTION="DVI previewer for X Window System"
-HOMEPAGE="http://xdvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="motif neXt Xaw3d emacs"
-
-CDEPEND=">=media-libs/freetype-2.9.1-r2:2
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	emacs? ( >=app-editors/emacs-23.1:* )
-	motif? ( >=x11-libs/motif-2.3:0 )
-	!motif? (
-		neXt? ( x11-libs/neXtaw )
-		!neXt? (
-			Xaw3d? ( x11-libs/libXaw3d )
-			!Xaw3d? ( x11-libs/libXaw )
-		)
-	)
-	dev-libs/kpathsea:="
-DEPEND="sys-devel/flex
-	virtual/yacc
-	virtual/pkgconfig
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	virtual/latex-base
-	!<app-text/texlive-2007"
-S=${WORKDIR}/${P}/texk/xdvik
-
-src_prepare() {
-	local i
-	# Make sure system kpathsea headers are used
-	cd "${WORKDIR}/${P}/texk/kpathsea"
-	for i in *.h ; do echo "#include_next \"$i\"" > $i; done
-
-	cd "${WORKDIR}/${P}"
-	eapply "${FILESDIR}"/${P}-freetype2-config.patch
-	cd "${S}"
-	eautoreconf
-
-	eapply_user
-}
-
-src_configure() {
-	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
-
-	local toolkit
-
-	if use motif ; then
-		toolkit="motif"
-		use neXt && ewarn "neXt USE flag ignored (superseded by motif)"
-		use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by motif)"
-	elif use neXt ; then
-		toolkit="neXtaw"
-		use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by neXt)"
-	elif use Xaw3d ; then
-		toolkit="xaw3d"
-	else
-		toolkit="xaw"
-	fi
-
-	econf \
-		--with-system-freetype2 \
-		--with-system-kpathsea \
-		--with-kpathsea-include="${EPREFIX}"/usr/include/kpathsea \
-		--with-xdvi-x-toolkit="${toolkit}" \
-		--x-includes="${SYSROOT}${EPREFIX}"/usr/include \
-		--x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_compile() {
-	emake kpathsea_dir="${EPREFIX}/usr/include/kpathsea"
-	use emacs && elisp-compile xdvi-search.el
-}
-
-src_install() {
-	dodir /usr/share/texmf-dist/dvips/config
-
-	emake DESTDIR="${D}" install
-
-	dosym ../../texmf-dist/xdvi/XDvi /usr/share/X11/app-defaults/XDvi
-
-	dodoc BUGS FAQ README.*
-
-	use emacs && elisp-install tex-utils *.el *.elc
-
-	doicon "${FILESDIR}"/${PN}.xpm
-	make_desktop_entry xdvi "XDVI" xdvik "Graphics;Viewer"
-	echo "MimeType=application/x-dvi;" >> "${ED}"usr/share/applications/xdvi-"${PN}".desktop
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	if use emacs; then
-		elog "Add"
-		elog "	(add-to-list 'load-path \"${EPREFIX}${SITELISP}/tex-utils\")"
-		elog "	(require 'xdvi-search)"
-		elog "to your ~/.emacs file"
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-text/xdvik/xdvik-22.87.03-r4.ebuild b/app-text/xdvik/xdvik-22.87.03-r4.ebuild
index 2f0571e7826e..7502839c86c5 100644
--- a/app-text/xdvik/xdvik-22.87.03-r4.ebuild
+++ b/app-text/xdvik/xdvik-22.87.03-r4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://xdvi.sourceforge.net/"
 SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
 S="${WORKDIR}"/${P}/texk/xdvik
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="motif neXt Xaw3d emacs"
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 7fbef16c96f6..155e9f4c2ac6 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index df6a330fc606..07a8b600145a 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,6 +1,4 @@
-DIST protobuf-3.17.3.tar.gz 5235236 BLAKE2B 2495e678c8f9436d4e5a30ccee8b6226125d418ac7ecf7df20b078a1a16c221cbccab7d846dcd56a90220c106617fa75c410a21b62612fedec378cd7e8571350 SHA512 b4030b4474cc5fb5a62501200725dd488e6e66e3ced4ed12ab4ee029fcfed305e92ec966adafbdd343afffd186908163849422b95eaa500e7e741ac325d01d12
 DIST protobuf-3.19.3.tar.gz 5293258 BLAKE2B c05b70ffca97f7166ea6a511a36907eed125edf1ebf17f908718221d9b851be84dfb2b1b39973f2faf35f6ade630e6ba4f9e8b91b8fbc922c5db97079323ee6e SHA512 1c003e7cbc8eae6a038f46e688b401ee202ba47f502561e909df79770f6e8b7daf3dc1ccc727e31bfb5b52cd04cb4fef7d2d2a28d650c13f396872ad4aa076c6
-EBUILD protobuf-java-3.17.3.ebuild 1451 BLAKE2B 4d08dcb9be366902af79f53bf8cb388ed2fd61192406ccca8089147f3854cef4e9d6824482dc2f35209cfe305e1ac69d1be790eeac87365aefd550c0a9d215ea SHA512 6804911a2b3167a7eb0889b4f7da071c97ec2b7aca9adb613679905f6ae3abb391caefbf3737a5ec30e7aef4ecd9a817df05b7ac16d95f893d4b6cce853cb89c
 EBUILD protobuf-java-3.19.3.ebuild 1451 BLAKE2B c0bad09302e1e52cff018223c055939e2d4335874f2be95e913705368926106c6967b5a98d7f0a392037060c040fd3116210f0d1de567dc17e66bfc252202e4b SHA512 a74e044d91db564a682f8d9b82fa73608fc10f2b0a917b1eb696375f5993e62cf03289a31b7e28aa27cbfdf027bf62160083ff39186d1f8333b52633ba5ed0fb
 EBUILD protobuf-java-9999.ebuild 1389 BLAKE2B e7a8e41fade60ff00e35c2cb29c185d68b2b5d41d99611f07eda97968c3b2f0d3e956304ae739a82cd386101dbd9936431483019b7bc38aad35d392674aa2bf4 SHA512 c0f3964bdde178cdf734318c9c5c42d5332401c276fa9513ec42e7729e8105b8129f89a53704f3b0622d831f96068501a131d47636aa95504a6d46df2e093f20
 MISC metadata.xml 548 BLAKE2B 2468487e12d536d67daebf5b7a21cd63a9c4af321a8979132e63d9b8394bf577e347f891326c73bfa6907e82ca355ea0d4ec40a37bb297db0da1e55a62b6ef33 SHA512 c0c2556fbf8821f3a75ed344daa59b4fc355029f96efb8f9784f54c819916adeb46b2c5d8c2e8d405dc58395c2f18b30cda69c6d406948a066bd1d78a55df80b
diff --git a/dev-java/protobuf-java/protobuf-java-3.17.3.ebuild b/dev-java/protobuf-java/protobuf-java-3.17.3.ebuild
deleted file mode 100644
index 9f9368560137..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.17.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/28"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-BDEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/protobuf-${PV}/java"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-src_prepare() {
-	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
-	eapply_user
-	popd > /dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	"${BROOT}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install
-}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 6c45b1b9cbd0..5c4ead22942c 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/darts/Manifest b/dev-libs/darts/Manifest
index 6bd025c2f896..57bd47b5d80e 100644
--- a/dev-libs/darts/Manifest
+++ b/dev-libs/darts/Manifest
@@ -1,6 +1,4 @@
-DIST darts-0.32.tar.gz 234001 BLAKE2B e40f16e6ead25809d981c98924867903e1d0f3734682b61ad1be40a10a4212795dfdef55a0eb6f9d0f60ef7676ed27929a6812bf8f57972dcf00875e99d9917b SHA512 b9af8ce60688f5858dac2cac35a8666848dba6729f9f4364786123a1c0484e56c8b981ec04e59653afbcf20cce3b326a49243095213efb525b5669472ac7358e
 DIST darts-0.32h_pre20181117064816.tar.gz 38856 BLAKE2B db4bf7ca88ceb81dcaee4494708d3f469dfc4f1ce53aa731f291d4b7d73f2c48a9e8d97caf32fd0bdd66aaba1c9e3e2e0289a5f2fdf7f5f1f2351c3808d6a98c SHA512 092cc833fff937365117f5b780f09a1ffdd25104ab57e36f7cba25a9a6bee289c105cae997a50b61b5b542c1c34d71bddf132d0ca14d563198b57caa9af2ac22
-EBUILD darts-0.32.ebuild 729 BLAKE2B 1dc4fef45e356b9a262761d3856ef7f738b410abf05ae38b3e9234d7add6628373742188d5de7e7d909e03da6ab80116f78758c18d82d90228dc0ea1c1ae6e4f SHA512 00b64494e1fe11c587c0a6112e6934574d081657a87f3ae0e9dce4fb5f769b946e52d58039f2d07b4d8ec57a048769fdd6e0830e73b5e1ca4ed11726dfbed954
 EBUILD darts-0.32h_pre20181117064816.ebuild 1369 BLAKE2B f7c2ba34ea48a433c0efc6557cf5e16db947cd1595c66c79ad84ad0e83088d88800977b38fd62cf7e8a6997687b29c1f27af2e0b3a420b0b723719dda0112263 SHA512 5804a1dc6aca3ecef6ce37b6bde5bca8b3b7f2472364d5a966e000c6ac5a4f3547ae05baa02ebf6af031659f1d4faf8a3c8d448f44c48e4b63ab1da929b92031
 EBUILD darts-9999.ebuild 1209 BLAKE2B fc98dc93002e7a6e7d4269cf2a13b8228056b29b72f8dee5519587bf8d4888678ee0748a86074d5e6b73d877a8d8fea7fa77eb31b998295cd99145b36496a0f2 SHA512 892651f7fdebb19693f99e03d1f3fda914aef6b91d56192692292252a1a3978bbf58e229bd0e9e051b3845ce7d5046d6aac05f86da850e252e3bf85913516592
 MISC metadata.xml 318 BLAKE2B 67d2ac0f28e51ff5c9b2d21a216a674285ada72e7c7de4d705cb9a767a086abf1779cf7f877c540c18d64d5a70de7df570af42b278f57d27d3ed24739e476856 SHA512 52935d348cee3b72a2f5da851b5600414da7f923fa8be357006f06392f7496f98d04bbc92a52696ac42c70b1315a53107d2378bc5e3a79b2cacd5623e8f0619e
diff --git a/dev-libs/darts/darts-0.32.ebuild b/dev-libs/darts/darts-0.32.ebuild
deleted file mode 100644
index b7c803763059..000000000000
--- a/dev-libs/darts/darts-0.32.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2003-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="A C++ template library that implements Double-Array"
-HOMEPAGE="http://chasen.org/~taku/software/darts/"
-SRC_URI="http://chasen.org/~taku/software/darts/src/${P}.tar.gz"
-
-LICENSE="|| ( BSD LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="zlib"
-
-BDEPEND=""
-DEPEND="zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf $(use_with zlib)
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS ChangeLog
-	(
-		docinto html
-		dodoc doc/*
-	)
-}
diff --git a/dev-libs/liblouis/Manifest b/dev-libs/liblouis/Manifest
index 6d90cdf194b4..6f89a564fc62 100644
--- a/dev-libs/liblouis/Manifest
+++ b/dev-libs/liblouis/Manifest
@@ -1,7 +1,9 @@
 DIST liblouis-3.13.0.tar.gz 14683684 BLAKE2B 9596fac30ee8512498826ea11c3fe4d9dfba6706166938852242533f1fadde9ca8e363ea1364ebb4266b366ee49863d84ad757f8634d90e48dd8c562c31e9e8d SHA512 68f0205dc55a106c5707f959c1c0d3c121dfe62f263a664e6bec0780bee65cce2fb5d7033ae1c8312d1d79f7ccaf650af71906e8651b60f11219758e41051b61
 DIST liblouis-3.17.0.tar.gz 14868166 BLAKE2B 2edc5ef4366e29080d0d138fe45d946730e04dea278a14751106a25862f6266fe0fda492e12f4d2aa7d26d7277a11dfa2eaf8be39cdeffbcf83f2c143922e6d6 SHA512 9511e0f76ef6def3fa30f0bce4df188b2a11251e8ced0a76a92e172026e6751bc19b2c8ccd5789043b65398190a367bca03b3f1449344750e63ebd0fde60b4e3
 DIST liblouis-3.20.0.tar.gz 15119793 BLAKE2B ed8eb9df0364818c73b1ac8afa5311cdcf8bb47b142607ceeced731655ed14a3d5be83465dd923164902b807424a5e1180fc4ae7fd3ef9ed50065f6e6e9b3b0e SHA512 edc94f1f91fbaffcc13c6dbe7958c7f41dac3328038b25bb446d54dc3e26d904da0d0d5e19268cee6b6de3ef228dcd45ff50164ccd148939e6440fe8b5d4b428
+DIST liblouis-3.22.0.tar.gz 16397405 BLAKE2B b99231398618f4fc563b348fe44cf99480bcde45fbfba8985aa1f1b6da07bb242ff772d104ee820d7252563c17730b393408cffc05c36e04aba82415ae3632ba SHA512 0ad9466b001935b442732c18ddce973236fd7cd0629a1b7dcc6e4cd61c9fb0b8f78b0ca51a4fd94ca262e8b8687dcc6aed06967dd2cd1bea8b5b1a0c78e1f25f
 EBUILD liblouis-3.13.0.ebuild 1743 BLAKE2B 488ab7006fac89c4304ba02924d8e24a99df1cbbacf18083a5a69367dbb9bd2af1b7aef6a132dde5f1b9ef06c05639aaec2356702336feaa2cc92f2b06a67eae SHA512 3d8a7ad11b920e767511611cf147abcff1144141d4afa1b90aade5e1b78659c04a792753e040c5776aa1ac30635985c8e8d0aaaec2ae64ae2b170b2fdf3bba02
 EBUILD liblouis-3.17.0.ebuild 1754 BLAKE2B 4ee8c8921887dc304b833d4b1c15eeffcb305783e1683264118b2dab887d87f93c375cdc9b99c376e80d1aaa8aa7fcb84160334080f723f1e1732767ab325fde SHA512 be9c3ebdee4e7418fc93bb66b73c97da3e0a5b63f35d5c6df9c2a8e6cd90193387af7a980602d23ad061c4e969bcd2c83142a33b9e0e444348b10a40b726c5d8
 EBUILD liblouis-3.20.0.ebuild 1757 BLAKE2B 703f4c636cc8e95653e3ecf86473f843957a5922f034469717efde5423bf204640965617eb304148d9ca927447aa8d340acf76b7e64868b7ef116b98a78e1707 SHA512 7a3b15852d3a6246d88190ada360b84e412417f2d2eeecdffc47c3076e83e9e98f948a9bdbf418c2f42598dfc2ee6266fc2600a13d90d1b802fdc447cfe9b941
+EBUILD liblouis-3.22.0.ebuild 1757 BLAKE2B 9e0607e2d57c66f9fe7bb2fd4ec55a9fb1347b18eb41db5df790696bf0ab9d295d3e9c9a7f5fc1f8ae4413b5f28331d6ad19e0428615bd4b8cb2e1602bd0866b SHA512 fcb7149bc81d45ec4b49f7e3ad14af616bd6019dd8ab4980d60c5e823a89b760541892b2e8abb6b780f16e67fc2db4348f449aaaa9cf31782a17cdfc3a3fae17
 MISC metadata.xml 352 BLAKE2B 5c562663af1cb8a830ef585416cd7dbd4977393310fb2216ac6fb5bbaa594ad4fb144bac1a49d161e5946978cbc28acdbaf5d59e781da5438d7116f34c259290 SHA512 23c7fd40c40c8e574d995d0fdbe56242e9b1874d576ba8a34cee80e3c3e41785e782ca37fb3f89665c24d5857cb956b70c9219dc3dc35cb209f947f0b267c4be
diff --git a/dev-libs/liblouis/liblouis-3.22.0.ebuild b/dev-libs/liblouis/liblouis-3.22.0.ebuild
new file mode 100644
index 000000000000..572ec0ce9c90
--- /dev/null
+++ b/dev-libs/liblouis/liblouis-3.22.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_OPTIONAL=1
+inherit distutils-r1
+
+DESCRIPTION="An open-source braille translator and back-translator"
+HOMEPAGE="https://github.com/liblouis/liblouis"
+SRC_URI="https://github.com/liblouis/liblouis/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/20"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-apps/help2man
+	python? ( ${PYTHON_DEPS}
+		>=dev-python/setuptools-42.0.2[${PYTHON_USEDEP}]
+	)
+	test? ( dev-libs/libyaml )
+"
+
+src_prepare() {
+	default
+
+	if use python; then
+		pushd python > /dev/null
+		distutils-r1_src_prepare
+		popd > /dev/null
+	fi
+}
+
+src_configure() {
+	econf \
+		--enable-ucs4 \
+		--disable-static
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		pushd python > /dev/null
+		# setup.py imports liblouis to get the version number,
+		# and this causes the shared library to be dlopened
+		# at build-time.  Hack around it with LD_PRELOAD.
+		# Thanks ArchLinux.
+		LD_PRELOAD+=':../liblouis/.libs/liblouis.so'
+			distutils-r1_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	if use python; then
+		pushd python > /dev/null
+		LD_PRELOAD+=':../liblouis/.libs/liblouis.so' \
+			distutils-r1_src_install
+		popd > /dev/null
+	fi
+
+	# These need to be after distutils src_install, or it'll try to install them from under python/ as well
+	DOCS=( README AUTHORS NEWS ChangeLog doc/liblouis.txt )
+	HTML_DOCS=( doc/liblouis.html )
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index ca57cd14d5f4..d66e3c1be023 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,8 +1,10 @@
+DIST libxml2-2.10.0.tar.xz 2698684 BLAKE2B 655b9241db06b98f5d33f6d02f2dbf5f998ae9a125f2c16e4d8ce3ee902d53ec14e728e7f3de2aea47b45e825b9ed78f17caffd9e4e9afbde40e1d7b1e047e7f SHA512 0a7a58414c3a4f21e9b052cc18f18032bc646f2690483bb95e37e132a3fc5789f0ec7bbc91b58497df59dbccf0e52f6e6280947762f47a035e85a316e96b1623
 DIST libxml2-2.9.14-patches-r0.tar.bz2 8304 BLAKE2B 067faba5bfcbf81e2ef356925c0d3b4ef0aff7604db049366180b8217b781c60c2746be348c5e1a09de925e54fc69e3e431f7e2199ce326b6ff88ea9352ca45c SHA512 e97bada92a14ef0501a5f7be312d35d26eb52b648102d028dc11b3eef62ee0597540d0b474f54bd015a914a9cb7600d4dc34912b0ead5230136e945d80ae8428
 DIST libxml2-2.9.14.tar.xz 3129968 BLAKE2B ab584503d5209e4aaf41ae6f44aed5e94c0ae29e28cfba39a9012568aa97515af861b47891b84d2a352a07357626ba50ddb1e344e911fa14ff2ce93c5beff1f1 SHA512 d08e6cafb289c499fdc5b3a12181e032a34f7a249bc66758859f964d3e71e19fd69be79921e1a9d8ab1e692d15b13f5fae95eeb10c3236974d89e218f5107606
 DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be SHA512 d5c4d26b324ed21f4e0641cd7f8b76dbf9de80df8b519982e44d41c960df29fd03618e02e9693b2d11ad06d19c4a965274c95a048ec3b9653eacb919a7f8b733
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
+EBUILD libxml2-2.10.0.ebuild 5260 BLAKE2B 67df7ec9e154e72561ee91477b3d3fee5d664cd776fd454dd35fe656368cc52b0bb566fc55d9d1fccbb66c7cfe62cc5041b5810df7dd2371efa6ecf5855f5cfb SHA512 1dc948ee62e19e5c1a875f8b17d09c900b0141d65e1613bb311b138de8d2ae1ac79319ffb8f879147932ec42b320458add04bbe134f78fd4a8afcd72a87e9858
 EBUILD libxml2-2.9.14-r1.ebuild 5029 BLAKE2B 74875e62eede1a5dcacecbd383cc33cf95ef21f49998b88ee88166ddf659f1241840a44412118a3a2a59af6d1438c74e10beadf709ee8da8b826ca1d60e553f1 SHA512 61eac30dfcafe2daf7aa36c85d2c6803e9f44514138d087954ccd626a390056e8018c578880506f171bd4d6865ae22bcf492d5f01acd87ab77d992636cbd9827
-EBUILD libxml2-9999.ebuild 5076 BLAKE2B bd642aea861bd1b6245953514ad245fb47917d5b21a68c52d2962d28fcd4e58e9552e12a0f1f7abb039d51f80bd8d8969b08a8b2015acd136ab6d1a609b62ae9 SHA512 de9253d2f149d3e80e3af1be1a0ca412b49a3146bc63746c7dc1680c0bc3829c8999657126d976bc64f59202cf6f146d7356999e832d05bf759f61a277808383
+EBUILD libxml2-9999.ebuild 5077 BLAKE2B 197d208dc28083f441a266b53d8dd4ac45d6d2432aea3c25de92afddb5de5b97f1cb5a08097f346853cffa3dc3b7f85c1852ca9c3feb1c4ef1c514e5fcc61d61 SHA512 4e08e864d72a90d3450b8fb734a9408a1b57895f3e249fff84acf74663a51dfb690ebaa680898565ca7bce59be080905cc5be4b1c8ee0b2684c9b5c3dd2eeb96
 MISC metadata.xml 458 BLAKE2B 318644d7202e85490c0b2f7a6fd36744cce5e4fa8929534149823d679a7fd01d118b9653ea5039c9e82b7cdcd423bf4541313cf550027ccfab8393f0b9b8ceca SHA512 b173246c3ec8351343bbe16f5572728ce6c6740056a0cf96e9eb4d975c181d54213d06c41ada9c38ac11727359d14d453cd1e824b29a52f7291a7ee50bfa5ed0
diff --git a/dev-libs/libxml2/libxml2-2.10.0.ebuild b/dev-libs/libxml2/libxml2-2.10.0.ebuild
new file mode 100644
index 000000000000..d9eb0d19172a
--- /dev/null
+++ b/dev-libs/libxml2/libxml2-2.10.0.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Note: Please bump in sync with dev-libs/libxslt
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="xml(+)"
+inherit autotools flag-o-matic python-r1 multilib-minimal
+
+XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
+XSTS_NAME_1="xmlschema2002-01-16"
+XSTS_NAME_2="xmlschema2004-01-14"
+XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
+XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
+XMLCONF_TARBALL="xmlts20130923.tar.gz"
+
+DESCRIPTION="XML C parser and toolkit"
+HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2"
+	inherit git-r3 #autotools
+else
+	inherit gnome.org #libtool
+	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
+
+SRC_URI+="
+	test? (
+		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
+		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
+		https://www.w3.org/XML/Test/${XMLCONF_TARBALL}
+	)"
+S="${WORKDIR}/${PN}-${PV%_rc*}"
+
+LICENSE="MIT"
+SLOT="2"
+IUSE="debug examples icu lzma +python readline static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+if [[ ${PV} == 9999 ]] ; then
+	BDEPEND+=" dev-util/gtk-doc-am"
+fi
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/xml2-config
+)
+
+DOCS=( NEWS README.md TODO TODO_SCHEMAS python/TODO )
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	else
+		local tarname=${P/_rc/-rc}.tar.xz
+
+		# ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR},
+		# as they are needed as tarballs in ${S}/xstc instead and not unpacked
+		unpack ${tarname}
+
+		if [[ -n ${PATCHSET_VERSION} ]] ; then
+			unpack ${PN}-${PATCHSET_VERSION}.tar.bz2
+		fi
+	fi
+
+	cd "${S}" || die
+
+	if use test ; then
+		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
+			"${DISTDIR}/${XSTS_TARBALL_2}" \
+			"${S}"/xstc/ \
+			|| die "Failed to install test tarballs"
+		unpack ${XMLCONF_TARBALL}
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautoreconf
+	else
+		# Please do not remove, as else we get references to PORTAGE_TMPDIR
+		# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
+		#elibtoolize
+
+		# Temporarily for Python 3.10 fix (version used for
+		# dist tarballs fails w/ "3.1" error)
+		# See https://gitlab.gnome.org/GNOME/libxml2/-/issues/392.
+		eautoreconf
+	fi
+}
+
+multilib_src_configure() {
+	# Filter seemingly problematic CFLAGS (bug #26320)
+	filter-flags -fprefetch-loop-arrays -funroll-loops
+
+	# Notes:
+	# The meaning of the 'debug' USE flag does not apply to the --with-debug
+	# switch (enabling the libxml2 debug module). See bug #100898.
+	libxml2_configure() {
+		ECONF_SOURCE="${S}" econf \
+			--enable-ipv6 \
+			$(use_with debug run-debug) \
+			$(use_with icu) \
+			$(use_with lzma) \
+			$(use_enable static-libs static) \
+			$(multilib_native_use_with readline) \
+			$(multilib_native_use_with readline history) \
+			"$@"
+	}
+
+	# Build python bindings separately
+	libxml2_configure --without-python
+
+	multilib_is_native_abi && use python &&
+		python_foreach_impl run_in_build_dir libxml2_configure --with-python
+}
+
+libxml2_py_emake() {
+	pushd "${BUILD_DIR}"/python >/dev/null || die
+
+	emake top_builddir="${NATIVE_BUILD_DIR}" "$@"
+
+	popd >/dev/null || die
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use python ; then
+		NATIVE_BUILD_DIR="${BUILD_DIR}"
+		python_foreach_impl run_in_build_dir libxml2_py_emake all
+	fi
+}
+
+multilib_src_test() {
+	ln -s "${S}"/xmlconf || die
+
+	emake check
+
+	multilib_is_native_abi && use python &&
+		python_foreach_impl run_in_build_dir libxml2_py_emake check
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	multilib_is_native_abi && use python &&
+		python_foreach_impl run_in_build_dir libxml2_py_emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use examples ; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
+		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die
+	fi
+
+	rm -rf "${ED}"/usr/share/doc/${PN}-python-${PVR} || die
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
+	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
+	if [[ -n "${ROOT}" ]]; then
+		elog "Skipping XML catalog creation for stage building (bug #208887)."
+	else
+		# Need an XML catalog, so no-one writes to a non-existent one
+		CATALOG="${EROOT}/etc/xml/catalog"
+
+		# We don't want to clobber an existing catalog though,
+		# only ensure that one is there
+		# <obz@gentoo.org>
+		if [[ ! -e "${CATALOG}" ]]; then
+			[[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
+			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
+			einfo "Created XML catalog in ${CATALOG}"
+		fi
+	fi
+}
diff --git a/dev-libs/libxml2/libxml2-9999.ebuild b/dev-libs/libxml2/libxml2-9999.ebuild
index d651157658dc..0fe269e46054 100644
--- a/dev-libs/libxml2/libxml2-9999.ebuild
+++ b/dev-libs/libxml2/libxml2-9999.ebuild
@@ -145,7 +145,7 @@ multilib_src_test() {
 	emake check
 
 	multilib_is_native_abi && use python &&
-		python_foreach_impl run_in_build_dir libxml2_py_emake test
+		python_foreach_impl run_in_build_dir libxml2_py_emake check
 }
 
 multilib_src_install() {
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index fa05e3eab189..a95dc8f577e5 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -1,4 +1,6 @@
 DIST libxslt-1.1.35.tar.xz 1827548 BLAKE2B 9667a93e61f50098a512c1351bce2ee937fc5d29488d010b525122d28ffedc73e0930402f3df2d378161a031dc016a15f0f03bdc343f0c4aa5d0b5c454f8002d SHA512 9dd4a699235f50ae9b75b25137e387471635b4b2da0a4e4380879cd49f1513470fcfbfd775269b066eac513a1ffa6860c77ec42747168e2348248f09f60c8c96
+DIST libxslt-1.1.36.tar.xz 1591356 BLAKE2B 7cdb38b52295477dcf4c9fdecfb64bc8e770b37787b3f4522d6156838725f4ee506b6d58ec18d17adeb22c78aa62d0685e77ad23e72901d1083de4efef1ae0df SHA512 8a524d32fca18e8b108c1b300d1381c01a71a87dc72a09bc13613772c2836b1350d8caa0625782c6cadf953f7a15ce805718a754cef894ee77b20442fc10f5c8
 EBUILD libxslt-1.1.35.ebuild 1913 BLAKE2B 6c68990defa39e6d04fc70b4a2f4f3d1e1e27a109f04fefa85c0973aa8f9bd4680311fb25c8878cd65b29afc51bb7f4c7cc8a294b17f8a0f7a1cb77307ccc184 SHA512 9975052b66a9d23e5e0ce4c5df5647a4a43ebf9509dfae2cb90968fead499b2e7f83e0e74eb7ef51b969c0c0b7c89d97a1d1e62aa32b2b1eab6c724806498d01
-EBUILD libxslt-9999.ebuild 2767 BLAKE2B a4360b67aa78e3573be93cc592e0d97da859840c18ba25dcdf277a1d06a4aa30f0b087d08f4200b14c59a11bbea3f87d421f12998be17209a62e12bc5f7db03d SHA512 03e7ecf6b5bbe7c05270fe907581370a51e880330a36325c95b75d0b40d0fdd1c2c5f199f65dabd6194027a3d2900a0dab90d9c2a66952a9397c566202ef94ef
+EBUILD libxslt-1.1.36.ebuild 2936 BLAKE2B d725f63af0542cbef7e1d1806a3b46040b7ebfa884f61337df0b1b26a3e0fddbd965fb96788a2317cd2775fdcf4c7eb1cefd61da1ed4ee40b35acbb030ca0e33 SHA512 6d97110b767322df85985dd037fb495d44b235a514bf6ff780eb4bf9642bc74b24cfa613f8b654b1fd093ccde9ca02b524638a5aac9d11ff6a51cc0d8b68a5b1
+EBUILD libxslt-9999.ebuild 2774 BLAKE2B 9ad743eeb27ad818fb0ccbc2198b88855d4f35348386b99606ca2b7e4f66501b1a15072a1a9c759777ff0d9e00b8d24a4dc081851bd9202767c0357894aa6518 SHA512 2f9055e43050325543460580137da2d85cd8b188c80f2aa5bd5096a5900f13c6fbdf0c6029cc99527dc9e7a81bc5abbce1e33a5ffb447f290e838402c436fb0c
 MISC metadata.xml 458 BLAKE2B 75fd3316bf24367ed9748bf7fefd6ebc36811d1cef9606b9fd68155ef7412d192ebc3cc883a79f15210decb7ef7707ff82155ec2f04974c2dca84496660519a8 SHA512 9baf1253900f23539a78ef57cc03cca552eadeb92721517e2f3f54c3df72be8d364b30449ad433793c38a2c1872273231f0b3fe865b2ace2e605a1ae290c4f6b
diff --git a/dev-libs/libxslt/libxslt-1.1.36.ebuild b/dev-libs/libxslt/libxslt-1.1.36.ebuild
new file mode 100644
index 000000000000..6f198ac22606
--- /dev/null
+++ b/dev-libs/libxslt/libxslt-1.1.36.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Note: Please bump this in sync with dev-libs/libxml2.
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit autotools python-r1 multilib-minimal
+
+DESCRIPTION="XSLT libraries and tools"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libxslt"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxslt"
+	inherit git-r3
+else
+	inherit gnome.org
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="crypt debug examples python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND=">=virtual/pkgconfig-1"
+RDEPEND="
+	>=dev-libs/libxml2-2.9.11:2[${MULTILIB_USEDEP}]
+	crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/xslt-config
+)
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libxslt/xsltconfig.h
+)
+
+DOCS=( AUTHORS FEATURES NEWS README TODO )
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautoreconf
+	else
+		# Prefix always needs elibtoolize if not eautoreconf'd.
+		#elibtoolize
+
+		# Temporarily for Python 3.10 fix (version used for
+		# dist tarballs fails w/ "3.1" error)
+		# See https://gitlab.gnome.org/GNOME/libxslt/-/issues/72.
+		eautoreconf
+	fi
+}
+
+multilib_src_configure() {
+	libxslt_configure() {
+		ECONF_SOURCE="${S}" econf \
+			--without-python \
+			$(use_with crypt crypto) \
+			$(use_with debug) \
+			$(use_with debug mem-debug) \
+			$(use_enable static-libs static) \
+			"$@"
+	}
+
+	# Build Python bindings separately
+	libxslt_configure --without-python
+
+	if multilib_is_native_abi && use python ; then
+		NATIVE_BUILD_DIR="${BUILD_DIR}"
+		python_foreach_impl run_in_build_dir libxslt_configure --with-python
+	fi
+}
+
+libxslt_py_emake() {
+	pushd "${BUILD_DIR}"/python >/dev/null || die
+
+	emake top_builddir="${NATIVE_BUILD_DIR}" "$@"
+
+	popd >/dev/null || die
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl run_in_build_dir libxslt_py_emake all
+	fi
+}
+
+multilib_src_test() {
+	default
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl run_in_build_dir libxslt_py_emake test
+	fi
+}
+
+multilib_src_install() {
+	# "default" does not work here - docs are installed by multilib_src_install_all
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl run_in_build_dir libxslt_py_emake \
+			DESTDIR="${D}" \
+			install
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use examples ; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/tutorial{,2} || die
+		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die
+	fi
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/libxslt/libxslt-9999.ebuild b/dev-libs/libxslt/libxslt-9999.ebuild
index bd5015b66924..f76f9910fa95 100644
--- a/dev-libs/libxslt/libxslt-9999.ebuild
+++ b/dev-libs/libxslt/libxslt-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # Note: Please bump this in sync with dev-libs/libxml2.
 
 PYTHON_COMPAT=( python3_{8..11} )
-inherit libtool python-r1 multilib-minimal
+inherit python-r1 multilib-minimal
 
 DESCRIPTION="XSLT libraries and tools"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/libxslt"
@@ -14,8 +14,8 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxslt"
 	inherit autotools git-r3
 else
-	inherit gnome.org
-	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"
+	inherit libtool gnome.org
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/onigmo/Manifest b/dev-libs/onigmo/Manifest
index 9a19f134f2a1..5dd43d7770cd 100644
--- a/dev-libs/onigmo/Manifest
+++ b/dev-libs/onigmo/Manifest
@@ -1,5 +1,3 @@
-DIST onigmo-6.1.3.tar.gz 822127 BLAKE2B b2f020ba37c039022ee4ad0840006b7d84bd5c2b24975d3cc34a625379c478cdfacbb7247d5f2315da2e56beaa74fec5390140d4a3f0c29c66906d78d7207b8b SHA512 13ee0e97e5e7ea2a379cdfd8bab121ee116fc07495c6b3131621f6cd9b1748897e5e2c7dcf43845794b2ad4adef3b4076daf06f51aaf965e32cbac5d7bace1e6
 DIST onigmo-6.2.0.tar.gz 844935 BLAKE2B 768918af337be0bbe9fd9c9f15a630ce0a74f081832ef84ba13e48f4e6ed692ff1250e20272c039d95bb4d9b847bfaac829addd7de3f50780b7620b1f105406c SHA512 651ab8c64d8b8c0d56e1549809030be79a751b9d1c06af6527f8cf6014fba1bafea593d572e1cf766099a10fb4e6506ca683ef48131f47471348b5cbd35a1a77
-EBUILD onigmo-6.1.3.ebuild 869 BLAKE2B e7cf04de463ef485df5f79c1ef3a3d9fdd82b1592511d67778b91e6a2cdfa20fb6304c1bd58fc954da6cd1fb69b08b899e2ad0e68153df73ab3c0212764fc12f SHA512 85f5a083ac4843c81a62a781d55f23e857c6c7675e7f33742c2544fa3e0ce783cd2c1844375fbf8e33c4f518ca999dacc07caadccc22512773d93b711c75e37a
 EBUILD onigmo-6.2.0.ebuild 869 BLAKE2B 0e10f53f852c3685d51210ee50785ca0cdb9a4eb2a266e5007518275758a85384459e304e1e2d96c84c06a39c9ac86e139cb8c4fd89d45bf54097281f8661678 SHA512 86683ba757b9c648b692c59273ad1d412d28a759599d39339ee3d4a24445c64e73552ad6d0819f63fc5d75176b2e9d30c0e5f4fcb0de292b302f17c05ac4c637
 MISC metadata.xml 578 BLAKE2B 38a6a9291def49146005a2c79ba2b19920ae4be7f224e7692079d7c3d1741615f0dbf8502931436c71be8616a033919d56d4f39777cf7249d93c4831c7bd38f4 SHA512 7d02bf5155cd3effbaf019f459d5e001145bfbb8f8f4043412090d1b7feb72ea3d7ef3a262181e22ebfc527dea1b0b7010189c83e7c084f755369a9a8cc69c5a
diff --git a/dev-libs/onigmo/onigmo-6.1.3.ebuild b/dev-libs/onigmo/onigmo-6.1.3.ebuild
deleted file mode 100644
index fc5366e7b632..000000000000
--- a/dev-libs/onigmo/onigmo-6.1.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Onigmo is a regular expressions library forked from Oniguruma"
-HOMEPAGE="https://github.com/k-takata/Onigmo"
-SRC_URI="https://github.com/k-takata/${PN^o}/releases/download/${P^o}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/6"
-KEYWORDS="amd64 x86"
-IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
-
-DOCS=( AUTHORS HISTORY README{,.ja} doc/{API,FAQ,RE}{,.ja} doc/UnicodeProps.txt )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable combination-explosion-check) \
-		$(use_enable crnl-as-line-terminator) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index 3cd27bc5b09b..9c04c01fa93f 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -1,6 +1,4 @@
-DIST onig-6.9.7.1.tar.gz 935705 BLAKE2B 1042d5b211f53ad8983eb6b4e53beb165bc948bbef9a85ad12578a9237a804e3dcd0a8105914156230ec30e11f2c8a0372c37919cdde7b2be104c66a8b22fb52 SHA512 17711e0d451c41e74cb3f8ab4e78b0181578ef42cb35dc64e87871c82a41909334cb4eeb03eccdccf6904f699e6e82b0dbb54077138225b9b95471fcdeb8c486
 DIST onig-6.9.8.tar.gz 944148 BLAKE2B ee7d91f2d3a7a41d675bcbb9d18490aa3e5a9edb8f3c6e880d27f2218c476499bba21088def41fbb5d500bfb2916af85c2489fca5bd846594fab53ac492531af SHA512 5a3d220961c22cda981bbae06dc383401771362cdf67e4f0b5d2fa8951a03907362edae498f63226287e70715c0abe4acdd22ec3ceb74bbb226234a52c36a4d7
-EBUILD oniguruma-6.9.7.1.ebuild 1299 BLAKE2B 4d455f968ac9867a3eff80c3ada734c2a405339ec3533a7436c150a2dbd1e4c348f22e3b6293a1d04bc4b07696f4842e42349af4d51bd7ce0318dcdd6781ba83 SHA512 ea0c3b009438e3e77eb45dc49525d493e10e81fcff495adbb05d09e3783697b08f03568eaf87a1ae394c3a338ea9bf6461105381293d7ec6185a5a594ca776d7
 EBUILD oniguruma-6.9.8.ebuild 1290 BLAKE2B 8a77197456e357aa7aadc747b287d4291e917d8f6051bdb9165aca0fab95dc9796f0358b7820bc8ea6d4822f6f6d2be8767d630acb84772c3a5a997afd276a09 SHA512 0fe1c01d7e365123c4efa797be84931640db9542b815ab524d2b912d1bea90a229f2ff3aeabcde269a27f4eadbd567769718df2d534a9448fdd1aeabd05af6a0
 EBUILD oniguruma-9999.ebuild 1152 BLAKE2B c2910ecee5175e00896f5e91c712c9d1c284a37e44673f3609e45cf1fb935c46189daaba27792f468f1aa60c80c7a9cadef881abbad026cebc56cb8733317046 SHA512 0c49cf1fc620e9e8b1ef78193abc4cf6f9d92c5aea38f2a6914241c6f7bc074c7acec0e79183c996973eec80f2bccb70be7492af05bd999558813e60621e2166
 MISC metadata.xml 914 BLAKE2B c3ffcecee4f392fdaa44339db589f018967dc8dd2322e08ace06d4ffed958563ef51366a0cf09126e04f78673f7a621efb3eec85bd4e2322ed3c3b74cc0f7b4c SHA512 13a7f0fdc4ddeabe2bb163fc1421766f9dbb7730284aa9b732720d49d39ae91c4dce9283a17d36fb10bbfe832187655f1cbedfe2ab2e9a89bb664f8bf978dc7c
diff --git a/dev-libs/oniguruma/oniguruma-6.9.7.1.ebuild b/dev-libs/oniguruma/oniguruma-6.9.7.1.ebuild
deleted file mode 100644
index 06204a280f85..000000000000
--- a/dev-libs/oniguruma/oniguruma-6.9.7.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2003-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multilib-minimal
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit autotools git-r3
-
-	EGIT_REPO_URI="https://github.com/kkos/oniguruma"
-fi
-
-DESCRIPTION="Regular expression library for different character encodings"
-HOMEPAGE="https://github.com/kkos/oniguruma"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/onig-${PV}.tar.gz"
-fi
-
-LICENSE="BSD-2"
-SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="crnl-as-line-terminator static-libs"
-
-BDEPEND=""
-DEPEND=""
-RDEPEND=""
-
-if [[ "${PV}" != "9999" ]]; then
-	S="${WORKDIR}/onig-$(ver_cut 1-3)"
-fi
-
-DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/{SYNTAX.md,UNICODE_PROPERTIES})
-
-src_prepare() {
-	default
-
-	if [[ "${PV}" == "9999" ]]; then
-		eautoreconf
-	fi
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--enable-posix-api \
-		$(use_enable crnl-as-line-terminator) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index dfc9fceade2b..b4a8bf582ae7 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -1,15 +1,9 @@
 AUX 70protobuf-gentoo.el 170 BLAKE2B 6d9a92bd3310ca09d18dd762bc0bbd4b0b36184c17f95c80c02183c457fe4ff1142ca1e3207e5a77c078fe5f768cb3e85abc712abc1f4c85774ca1ebf178059b SHA512 ed73cd6b1bf6c0019e4da73c3a480b0f917e949dfad2696336e805263c81610b2a8a0514840e389db0f0e78252cf053d754c5e07731dc5e9c93c9e88f0b2923c
 AUX proto.vim 49 BLAKE2B 9b6d31105811a8f8cbcf76328172fda5b66b33351bb16573ed1ed08d4c553af2805962a6d6609fbdad4a2644bf9cecd1e771a557f138111ad2c0be959b497ee9 SHA512 65c1f49887c17973d1dfce07fa86d04c5079d2382826eaeb22e128570717f181c53d22ba50905252021f7e476a90ecd29f9d18799c1ccea64b01f4638323538e
 AUX protobuf-3.16.0-protoc_input_output_files.patch 10060 BLAKE2B e91d2e60ec9a901df0b0e11a8e51ff92b8765357e052231a915a2afa996c78096e18cf443708bf32e51b882c3fe2512e2ab9f7bb8ec1c6141f2c9bb7fb98af95 SHA512 03721151866f25564e203eb5af987649bf3c148ba7b9e1a2a837b336062b911d892714c4deaa5b19572a3ec47e3b309114ce67b0ec0adcff50d208b73283a7b5
-AUX protobuf-3.17.0-disable_no-warning-test.patch 965 BLAKE2B 584b43b43861280254f92ad48d8a068b6427e1af3822097f2ddd872983fae11f3bd7af1d73b9b58592987ac4aff7399fa31291e21db6656518bce10c5977a785 SHA512 a67fe3231064c1cf3f4ca94be4248fd65f455b1aaa1d1a09afae847a9b9bbae9673d1fec177e822abe0a83b2fe3342bd20dd9aff87adea0dddcc05309aaca682
-AUX protobuf-3.17.0-system_libraries.patch 6299 BLAKE2B a9252af294342e0a12137c618bc1e6fbe9aa021feaa458c2638aaf407dd6a43473587b7ac3e7278217874e5091ff7337234594715daa7567c9d3cf1bd3191973 SHA512 1d712f886e28907d5a5bef414c9fec56d1c056c316428f6e05fdfb87494e93506c17ff6dd5cff4ec716a6f20b56258393773701cdb6b04f87e44264a919a588e
 AUX protobuf-3.19.0-disable_no-warning-test.patch 1620 BLAKE2B e4f324ed59b2c31662cc625e9d3f1fdb20ee2a25769dbf86093e5000f73a01e11f05459989aaefeaf0414648cd52f1f1025b9d4f1423cdca4844e42e96f54836 SHA512 8c4bc72976a7eb3418b51e7a1c45b49d7ffaeb91a86f440008e6f162773b1db7afed4a6ae1d0b3510d49361c369b6552a9ba4976d104d804d825227aa7113d95
 AUX protobuf-3.19.0-system_libraries.patch 7514 BLAKE2B 1ff5c226232c325ed48cf16e2c47652615c4bd1503f1be8560e7f2e8658ffefeffeef72a6baf4368f758e30a4a81d582769b61dd0b3e383c8188cd03bf409c01 SHA512 b6a58e483dbb1f6151c2f7c735fbd55f34bcf98d6370eabb425dbd96e10cb87e8dfbf5024ad8f888cb80a095bc26598aceb55d576d37166550ee62db41c51a44
-DIST protobuf-3.17.3.tar.gz 5235236 BLAKE2B 2495e678c8f9436d4e5a30ccee8b6226125d418ac7ecf7df20b078a1a16c221cbccab7d846dcd56a90220c106617fa75c410a21b62612fedec378cd7e8571350 SHA512 b4030b4474cc5fb5a62501200725dd488e6e66e3ced4ed12ab4ee029fcfed305e92ec966adafbdd343afffd186908163849422b95eaa500e7e741ac325d01d12
-DIST protobuf-3.19.1.tar.gz 5291573 BLAKE2B a34f1a7cf99ecb6cb8a26bc858de6273bfd26aa9be1e89e48c16cb5df0f1e9576479344c8250017238dbac0d0c4ac33001125b5fc622cb64ed6b91023198b03a SHA512 f1271f5159a7be363a5f60ce4921dfea68a8468d66808330bacaeaa1cb7f652d045ab080b5d82816a6fd4e6d7d7fe79aaa6c8d66d81692721d36ce3bbf619f31
 DIST protobuf-3.19.3.tar.gz 5293258 BLAKE2B c05b70ffca97f7166ea6a511a36907eed125edf1ebf17f908718221d9b851be84dfb2b1b39973f2faf35f6ade630e6ba4f9e8b91b8fbc922c5db97079323ee6e SHA512 1c003e7cbc8eae6a038f46e688b401ee202ba47f502561e909df79770f6e8b7daf3dc1ccc727e31bfb5b52cd04cb4fef7d2d2a28d650c13f396872ad4aa076c6
-EBUILD protobuf-3.17.3.ebuild 3962 BLAKE2B ce7bdfc88b34eb0ac4a5f1cbf4ea50390c2e3e541a8465039b2c8c6d30d67ba88cb7529beeaf22bd2ef648c97e6e8a027c4fd03256d124213c2751ea57351fd0 SHA512 84db0ad5516ddfc3ee71c0465344200fcc83e20de1f3fb2ded37392220b3ada8cc54d51d00ee7ae11c6926430968f9ba4f26c1af6e09775f9bc1f6239b19ee21
-EBUILD protobuf-3.19.1.ebuild 3937 BLAKE2B 91f50e666933ee1c60528513827bec42fef40aa8c1d3fada8bef9c8407b870c6e925515edbba8202c0261d197f76de004d644b57f0a7f1808faebf5c8cfdb02c SHA512 f8d3b796169d113bdbd7b81e7433a121af13a0722c991bac50a6a009a2869ffbac4307857e649f08756c268732367d6005403e3b505e97407659e5237373325f
 EBUILD protobuf-3.19.3.ebuild 4138 BLAKE2B b37b99abbd41acfb2299e1a054d3c36547bdd63542ecc76d03d69344d7e89a03870eda97bba1ae6ae3284c33abdfca6930e74b6ab7109d93cd588c522d6d52f6 SHA512 2eadab6fd0f4b30338a294b69c866ff945e98f05549403484700b2e44314433736a682ab033bc4c2eb0a802934cba92567e6c9bad4d30d79a67d671f88e04591
 EBUILD protobuf-9999.ebuild 2672 BLAKE2B 5627d3ad014e4360622b5837088bd6bdbc24b78886d734b1b37d01b474a4013e1ddec73422224c235e4908e8c1601e9650a69ee13d2ddb024d734c05080ab344 SHA512 bf151189787bbd05ff37f7d4e7e160d29b52ae1740704dd2b3446cb94e34e141e41d53b5a28d829c74c50e7f3fa5fd36a6bf528f0ad00af7fdc5be972c5738fc
 MISC metadata.xml 595 BLAKE2B ba1b916e26b1e53f68e660f03d2e53fea8d22db04e8241ebec3ec20fbb251c2b164cf25d5fb6118423ce7721a822ae2302aab137b0748730e9a6860bf8e65668 SHA512 785e2550621b79b6350e1a6b52ed9992610769885fb29a9e92ee45a35158cc08707a3590dfcbece9ee9a5e16e1abfb614e8186132da7b942f2761b5e6ecfa827
diff --git a/dev-libs/protobuf/files/protobuf-3.17.0-disable_no-warning-test.patch b/dev-libs/protobuf/files/protobuf-3.17.0-disable_no-warning-test.patch
deleted file mode 100644
index eb1598c945fd..000000000000
--- a/dev-libs/protobuf/files/protobuf-3.17.0-disable_no-warning-test.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Disable no-warning-test which is compiled with -Werror option and whose only purpose is checking if compilation results in any warnings.
-
---- /src/Makefile.am
-+++ /src/Makefile.am
-@@ -713,7 +713,7 @@
- GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
- check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
-                  protobuf-lite-test test_plugin protobuf-lite-arena-test \
--                 no-warning-test $(GZCHECKPROGRAMS)
-+                 $(GZCHECKPROGRAMS)
- protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
-                       $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la     \
-                       $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la     \
-@@ -900,4 +900,4 @@
- 
- TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \
-         google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS)     \
--        protobuf-lite-arena-test no-warning-test
-+        protobuf-lite-arena-test
diff --git a/dev-libs/protobuf/files/protobuf-3.17.0-system_libraries.patch b/dev-libs/protobuf/files/protobuf-3.17.0-system_libraries.patch
deleted file mode 100644
index 3d5069dd1478..000000000000
--- a/dev-libs/protobuf/files/protobuf-3.17.0-system_libraries.patch
+++ /dev/null
@@ -1,121 +0,0 @@
---- /Makefile.am
-+++ /Makefile.am
-@@ -11,28 +11,10 @@
- # Always include third_party directories in distributions.
- DIST_SUBDIRS = src conformance benchmarks third_party/googletest
- 
--# Build gmock before we build protobuf tests.  We don't add gmock to SUBDIRS
--# because then "make check" would also build and run all of gmock's own tests,
--# which takes a lot of time and is generally not useful to us.  Also, we don't
--# want "make install" to recurse into gmock since we don't want to overwrite
--# the installed version of gmock if there is one.
- check-local:
--	@echo "Making lib/libgmock.a lib/libgmock_main.a in gmock"
--	@cd third_party/googletest/googletest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la
--	@cd third_party/googletest/googlemock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la
- 
--# We would like to clean gmock when "make clean" is invoked.  But we have to
--# be careful because clean-local is also invoked during "make distclean", but
--# "make distclean" already recurses into gmock because it's listed among the
--# DIST_SUBDIRS.  distclean will delete gmock/Makefile, so if we then try to
--# cd to the directory again and "make clean" it will fail.  So, check that the
--# Makefile exists before recursing.
- clean-local:
--	@if test -e third_party/googletest/Makefile; then \
--	  echo "Making clean in googletest"; \
--	  cd third_party/googletest && $(MAKE) $(AM_MAKEFLAGS) clean; \
--	fi; \
--	if test -e conformance/Makefile; then \
-+	@if test -e conformance/Makefile; then \
- 	  echo "Making clean in conformance"; \
- 	  cd conformance && $(MAKE) $(AM_MAKEFLAGS) clean; \
- 	fi; \
---- /configure.ac
-+++ /configure.ac
-@@ -236,12 +236,5 @@
- fi
- AC_SUBST([LIBLOG_LIBS])
- 
--# HACK:  Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS,
--#   since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock
--#   too.
--export CFLAGS
--export CXXFLAGS
--AC_CONFIG_SUBDIRS([third_party/googletest])
--
- AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc])
- AC_OUTPUT
---- /src/Makefile.am
-+++ /src/Makefile.am
-@@ -707,19 +707,11 @@
-   google/protobuf/testing/file.cc                              \
-   google/protobuf/testing/file.h
- 
--GOOGLETEST_BUILD_DIR=../third_party/googletest/googletest
--GOOGLEMOCK_BUILD_DIR=../third_party/googletest/googlemock
--GOOGLETEST_SRC_DIR=$(srcdir)/../third_party/googletest/googletest
--GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
- check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
-                  protobuf-lite-test test_plugin protobuf-lite-arena-test \
-                  $(GZCHECKPROGRAMS)
- protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
--                      $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la     \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la     \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
--protobuf_test_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include \
--                         -I$(GOOGLEMOCK_SRC_DIR)/include
-+                      -lgtest -lgmock -lgmock_main
- # Disable optimization for tests unless the user explicitly asked for it,
- # since test_util.cc takes forever to compile with optimization (with GCC).
- # See configure.ac for more info.
-@@ -811,12 +803,8 @@
- # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined.
- protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \
-                       libprotoc.la                                   \
--                      $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la        \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la        \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
--protobuf_lazy_descriptor_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \
--                                         -I$(GOOGLETEST_SRC_DIR)/include \
--                                         -DPROTOBUF_TEST_NO_DESCRIPTORS
-+                      -lgtest -lgmock -lgmock_main
-+protobuf_lazy_descriptor_test_CPPFLAGS = -DPROTOBUF_TEST_NO_DESCRIPTORS
- protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
- protobuf_lazy_descriptor_test_SOURCES =                        \
-   google/protobuf/compiler/cpp/cpp_unittest.cc                 \
-@@ -837,11 +825,7 @@
- # full runtime and we want to make sure this test builds without full
- # runtime.
- protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la     \
--                           $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
--                           $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
--                           $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
--protobuf_lite_test_CPPFLAGS= -I$(GOOGLEMOCK_SRC_DIR)/include \
--                             -I$(GOOGLETEST_SRC_DIR)/include
-+                           -lgtest -lgmock -lgmock_main
- protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
- protobuf_lite_test_SOURCES =                                           \
-   google/protobuf/lite_unittest.cc                                     \
-@@ -853,11 +837,7 @@
- # gtest when building the test internally our memory sanitizer doesn't detect
- # memory leaks (don't know why).
- protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
--                      $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la        \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la        \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
--protobuf_lite_arena_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include  \
--                                    -I$(GOOGLETEST_SRC_DIR)/include
-+                      -lgtest -lgmock -lgmock_main
- protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
- protobuf_lite_arena_test_SOURCES =       \
-   google/protobuf/lite_arena_unittest.cc \
-@@ -867,8 +847,7 @@
- 
- # Test plugin binary.
- test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
--                    $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la
--test_plugin_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include
-+                    -lgtest
- test_plugin_SOURCES =                                          \
-   google/protobuf/compiler/mock_code_generator.cc              \
-   google/protobuf/testing/file.cc                              \
diff --git a/dev-libs/protobuf/protobuf-3.17.3.ebuild b/dev-libs/protobuf/protobuf-3.17.3.ebuild
deleted file mode 100644
index c021f1f1885f..000000000000
--- a/dev-libs/protobuf/protobuf-3.17.3.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 2008-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/28"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="emacs examples static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-BDEPEND="emacs? ( app-editors/emacs:* )"
-DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-RDEPEND="emacs? ( app-editors/emacs:* )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.17.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.17.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.16.0-protoc_input_output_files.patch"
-)
-
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
-
-src_prepare() {
-	default
-
-	# https://github.com/protocolbuffers/protobuf/issues/7413
-	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8082
-	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8459
-	sed \
-		-e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
-		-e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
-		-i src/google/protobuf/arena_unittest.cc || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8460
-	sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" -i src/google/protobuf/any_test.cc || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/9392
-	sed -e "s/^AC_PROG_OBJC$/AS_CASE([\$target_os], [darwin*], [AC_PROG_OBJC], [AM_CONDITIONAL([am__fastdepOBJC], [false])])/" -i configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
-
-	if tc-ld-is-gold; then
-		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
-		tc-ld-disable-gold
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local options=(
-		$(use_enable static-libs static)
-		$(use_with zlib)
-	)
-
-	if tc-is-cross-compiler; then
-		# Build system uses protoc when building, so protoc copy runnable on host is needed.
-		mkdir -p "${WORKDIR}/build" || die
-		pushd "${WORKDIR}/build" > /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${options[@]}"
-		options+=(--with-protoc="$(pwd)/src/protoc")
-		popd > /dev/null || die
-	fi
-
-	ECONF_SOURCE="${S}" econf "${options[@]}"
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use emacs; then
-		elisp-compile editors/protobuf-mode.el
-	fi
-}
-
-multilib_src_compile() {
-	if tc-is-cross-compiler; then
-		emake -C "${WORKDIR}/build/src" protoc
-	fi
-
-	default
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins editors/proto.vim
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/proto.vim"
-
-	if use emacs; then
-		elisp-install ${PN} editors/protobuf-mode.el*
-		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
-	fi
-
-	if use examples; then
-		DOCS+=(examples)
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-3.19.1.ebuild b/dev-libs/protobuf/protobuf-3.19.1.ebuild
deleted file mode 100644
index 8cdee6955692..000000000000
--- a/dev-libs/protobuf/protobuf-3.19.1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 2008-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-else
-	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-
-LICENSE="BSD"
-SLOT="0/30"
-# -hppa for bug #831728
-KEYWORDS="~alpha amd64 arm arm64 -hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="emacs examples static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-BDEPEND="emacs? ( app-editors/emacs:* )"
-DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-RDEPEND="emacs? ( app-editors/emacs:* )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.17.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.17.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.16.0-protoc_input_output_files.patch"
-)
-
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
-
-src_prepare() {
-	default
-
-	# https://github.com/protocolbuffers/protobuf/issues/7413
-	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8082
-	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8459
-	sed \
-		-e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
-		-e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
-		-i src/google/protobuf/arena_unittest.cc || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8460
-	sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" -i src/google/protobuf/any_test.cc || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/9392
-	sed -e "s/^AC_PROG_OBJC$/AS_CASE([\$target_os], [darwin*], [AC_PROG_OBJC], [AM_CONDITIONAL([am__fastdepOBJC], [false])])/" -i configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
-
-	if tc-ld-is-gold; then
-		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
-		tc-ld-disable-gold
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local options=(
-		$(use_enable static-libs static)
-		$(use_with zlib)
-	)
-
-	if tc-is-cross-compiler; then
-		# Build system uses protoc when building, so protoc copy runnable on host is needed.
-		mkdir -p "${WORKDIR}/build" || die
-		pushd "${WORKDIR}/build" > /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${options[@]}"
-		options+=(--with-protoc="$(pwd)/src/protoc")
-		popd > /dev/null || die
-	fi
-
-	ECONF_SOURCE="${S}" econf "${options[@]}"
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use emacs; then
-		elisp-compile editors/protobuf-mode.el
-	fi
-}
-
-multilib_src_compile() {
-	if tc-is-cross-compiler; then
-		emake -C "${WORKDIR}/build/src" protoc
-	fi
-
-	default
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins editors/proto.vim
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/proto.vim"
-
-	if use emacs; then
-		elisp-install ${PN} editors/protobuf-mode.el*
-		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
-	fi
-
-	if use examples; then
-		DOCS+=(examples)
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-libs/utfcpp/Manifest b/dev-libs/utfcpp/Manifest
index ec94c89630d5..244b9b6326ae 100644
--- a/dev-libs/utfcpp/Manifest
+++ b/dev-libs/utfcpp/Manifest
@@ -1,7 +1,5 @@
 DIST ftest-20211106174116.tar.gz 3232 BLAKE2B 9a2184e82a19465333600b7c31de9a51e6716a4099f23145d93c967636da6539a0e71bfdd082507bf19a440df1199a1abf6f528b3957391f8b2a5c3e4dfb26ec SHA512 d92d3a3abd4f7b35971bfe7d74e1b822931818f60149a56ad29dd3238300ad71de1989fedc602a44a9c1a253da7bce758adf8d5b6da63ca6f322fb06dcefc98a
-DIST utfcpp-3.1.2.tar.gz 26388 BLAKE2B f0ebf7f054c488259d2a409b2c5201b73e928901cf337cdc2a99a2f64deaf431ee60328b3b61e134d3cd49428eb0c921057ea248269029ef2838ed72dd8af7d7 SHA512 d43df19d9e8652291f1301a326ec0d592bad43d6ecf9086947037f0ae0c1e70c2d96082c48066639e2b7c57c0ea0e4782d6b215d017cf96a4c73ff3a15feec75
 DIST utfcpp-3.2.1.tar.gz 27377 BLAKE2B 27c4becfa7e1f5e8b63ee0e03b9f66cf5d6743cff3706222dde6e21c3feb51897eddd7dcaeaaacc66513fdb209d5be392e83ba22ab7a7d848bdf9721577d6444 SHA512 5798487f12b1bc55d3e06aed38f7604271ca3402963efcf85d181fd590d8a088d21e961e77698e60dc2cdae8cf4506645903442c45fd328201752d9589180e0d
-EBUILD utfcpp-3.1.2.ebuild 934 BLAKE2B 799839e521d6c2c881b937c610cc7016907325d5ded407fbd452fda66ec1be1365fa696856b3fa8d18c11a822807c25f8f5c509bb023788b6d471afad856c0ce SHA512 a0b28f7086b5b2e3b4fc8b6cb4f0336a3697eaa9b77c9f711ae5e090561f2b7c62306c2abaea62f2424441fd0ffce5f3c8810878f25b579df8add3e300d441a8
 EBUILD utfcpp-3.2.1.ebuild 1364 BLAKE2B 7d899e89d9eeb09b94263c3ecd2c240f536ef8be90d1924abbfe266970b879fff24015971be972e3438fd6e650e6c4733632c5f9a9529668cdbefcd3c3b075de SHA512 283f8618f76877265c0cdf5f49f282993fc9c522daf937ca556795bd555755754e4591d3e40a24c9803c26a64cc557ae02f826a13b5fe9d120c1823f81f26ab8
 EBUILD utfcpp-9999.ebuild 1268 BLAKE2B 991a901db757f36b9ebc115a45b585ec3e0eca396820a3456106fd3c3872c22060f6821a5c3f6d35b7fed3f28bd8792df01ea2547e58325e92d477450fb99366 SHA512 067403e83fdbc062b9d82e676a156f7b867a4efdae70cccff1b3f00010655d9e65930874ae672d203a9a2c27fe4048ad42b709218111dbd98f530e9a2319b72d
 MISC metadata.xml 462 BLAKE2B 647bb7ccdffe7c2a5ca47f431b83c31d298430e4fbfba009bccaac39a3a514239318bab1dc946f5f49ea07169c79a1e1502b7d5d669e9e2afb886f405e8499ae SHA512 52bca2028d95d47e93f52295f9c3082e232e0cf14d24bf8e19eb4443d667703b3f1b34c641ed4a9038813cccb92ac1af2674acd20d6c2060db1f96878061a680
diff --git a/dev-libs/utfcpp/utfcpp-3.1.2.ebuild b/dev-libs/utfcpp/utfcpp-3.1.2.ebuild
deleted file mode 100644
index c23963c38a11..000000000000
--- a/dev-libs/utfcpp/utfcpp-3.1.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2015-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit cmake
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/nemtrif/utfcpp"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="UTF-8 C++ library"
-HOMEPAGE="https://github.com/nemtrif/utfcpp"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/nemtrif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND=""
-DEPEND="test? ( dev-cpp/gtest )"
-RDEPEND=""
-
-src_prepare() {
-	sed -e "/add_subdirectory(extern\/gtest)/d" -i CMakeLists.txt || die
-	sed -e "s/gtest_main/gtest &/" -i tests/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUTF8_SAMPLES=OFF
-		-DUTF8_TESTS=$(usex test ON OFF)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest
index 528dfe43c261..eed9e4283bb0 100644
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@@ -1,6 +1,4 @@
-DIST wayland-protocols-1.25.tar.xz 79784 BLAKE2B 6ca7fdc910bfd70ee5c3bb192bcf1c79c66c4bb713531b2d1d493bd3ec8509e1231176144d75f4e97a4c6ccc4ee1d836a7ac1cfeaaa59e927f10fa4a40cf023a SHA512 8269694a0780e4d32f1982ff4cbb50b1ef85f08157b9486bc6d7e489c64665a9d9f959121d0eede7c7b108a604d974b64d74cfdef8b5f14304465309afb0768f
 DIST wayland-protocols-1.26.tar.xz 81028 BLAKE2B 0813b8117c48b965560c3f112f67fa209f29b0c40fab2b46f46ccae227d68902277cce06281a6bd938fb3c2186e0cf4ea3670ed6d3b48b51ed655012bb1452ce SHA512 fa9c3963b548197461c8c0b9e16ebbf9cfa5b60053fc17f51b41e63a55b8c5420dd7e42313f93946b438ab47f04e1cd17bc92aae9e1074b47177dc7ce7042167
-EBUILD wayland-protocols-1.25.ebuild 755 BLAKE2B 3fc5c050521210e255e4f84757d8db55799f8f1f24a29cb80212e7961f73c16e043a64f76dfa3185aa56ed20a3e0759247f87cc41ff9f1adde61b147a276d2f4 SHA512 9ba008e0875dbcc8b3c597eb49073bce8afc3d94c0bf6837a684ef692e202b85eeb162640229199965922625763107080e4bf76388fc31b30d3eac2c758e08b6
 EBUILD wayland-protocols-1.26.ebuild 755 BLAKE2B 3fc5c050521210e255e4f84757d8db55799f8f1f24a29cb80212e7961f73c16e043a64f76dfa3185aa56ed20a3e0759247f87cc41ff9f1adde61b147a276d2f4 SHA512 9ba008e0875dbcc8b3c597eb49073bce8afc3d94c0bf6837a684ef692e202b85eeb162640229199965922625763107080e4bf76388fc31b30d3eac2c758e08b6
 EBUILD wayland-protocols-9999.ebuild 762 BLAKE2B 4f80b6c474c0ea97061ef6fb7703479bb82831a9a25450269356f967855e5b2d255d09a55db9a876ff7789dd8eab5d32c875c3947bf6e64c8eeabeb4c3faed4d SHA512 09dab59db34d5361d9630dc45c7728cf20c5f4491f6022093062b37756b776404964031664dd97efaaa878eb6fc850ce861b32d8e764173ecb28d432452ed719
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.25.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.25.ebuild
deleted file mode 100644
index 873c3dfde4c1..000000000000
--- a/dev-libs/wayland-protocols/wayland-protocols-1.25.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Wayland protocol files"
-HOMEPAGE="https://wayland.freedesktop.org/"
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/${PN}.git/"
-	inherit git-r3
-else
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? ( dev-libs/wayland )
-"
-RDEPEND=""
-BDEPEND="
-	dev-util/wayland-scanner
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index 1869c2b299c2..7e4030b8f135 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,6 +1,4 @@
-DIST wayland-1.20.0.tar.xz 225188 BLAKE2B d607610ad8b30b6b3bbfc3945679f698030f271766cfb72425f98f170a96469fb085fb9a746a866b8562d7f452c844e61ad57f634dcf365474c7d050b76022e9 SHA512 e8a1f410994b947f850799bdd0d95a2429d8467f853e62a0ab3915a4e9fe130f8aa977e03715114ab740c6ec546edea63d275ce7f927d4f3029ea126e6a7d215
 DIST wayland-1.21.0.tar.xz 225936 BLAKE2B 2b43eb1517d476bb2b4daed1083373655b57d047968fdb93dbbbbe4235af12e25557627e30b5c3d2575bac4beaf1e0a0b8ef10a3c673538d9097501f33c05836 SHA512 5575216d30fdf5c63caa6bcad071e15f2a4f3acb12df776806073f65db37a50b5b5b3cc7957c5497636f4ac01893e2eaab26e453ded44b287acde01762f5fdc3
-EBUILD wayland-1.20.0.ebuild 1516 BLAKE2B 1a602cda157f1184410d3d1bb71969f182ce9098e9ea0c9be023c1cf158850bd2b9fa3958caa7f3f5fd3974697e408425abe65c1a34d7fc8a826e21e3411325f SHA512 8f2522a515137cab3c4682b136b5a733ef155db57f88e49e4ccb6cfd79911f57173df94d2233ca8a9d9cfe94ad4f6f5ef243d3586345dc9b8e5856409717dfc4
 EBUILD wayland-1.21.0.ebuild 1478 BLAKE2B 0884da89055eb938e9dd782c9ad0e50358205e4752ed4600f8f216f08081f34252c9f1122edffd1123be6f3693d0fe4ddbfd3ad4d2a908e2410ba911d18e44ad SHA512 f6a4e29a0bd5c0bf567a378dd3a715ba3b1f37731777766591467707b426fa845c33e5726e69028093cd5debb300368a73d41190bcbc2e5132479ba0d1397fe4
 EBUILD wayland-9999.ebuild 1485 BLAKE2B 8e82cc08d4efab01be9e60daa08f568c9c2760cd5247f66ac2aac0886ec0dcb3b9d5cc262ed7612e08c77f97c08371b454a35f2af693eb6a8cc88a19c23575d0 SHA512 fbb427c35c1e5df874e99391438babcca5c943b548dfc8c4380e694979833045a94be367d920d696c9e5b332171351e2ff298214e7e82c0c4bbc42a669ca9f12
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/dev-libs/wayland/wayland-1.20.0.ebuild b/dev-libs/wayland/wayland-1.20.0.ebuild
deleted file mode 100644
index 633eb59476d0..000000000000
--- a/dev-libs/wayland/wayland-1.20.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git"
-	inherit git-r3
-else
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-inherit meson-multilib
-
-DESCRIPTION="Wayland protocol libraries"
-HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	~dev-util/wayland-scanner-${PV}
-	virtual/pkgconfig
-	doc? (
-		>=app-doc/doxygen-1.6[dot]
-		app-text/xmlto
-		>=media-gfx/graphviz-2.26.0
-	)
-"
-DEPEND="
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	dev-libs/libxml2:=
-	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_native_use_bool doc documentation)
-		$(meson_native_true dtd_validation)
-		-Dlibraries=true
-		-Dscanner=false
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	# We set it on purpose to only a short subdir name, as socket paths are
-	# created in there, which are 108 byte limited. With this it hopefully
-	# barely fits to the limit with /var/tmp/portage/${CATEGORY}/${PF}/temp/x
-	export XDG_RUNTIME_DIR="${T}"/x
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	multilib-minimal_src_test
-}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index b300025055d3..9b4a72350c6c 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/blinker/Manifest b/dev-python/blinker/Manifest
index 490345066c0d..5237ebdce1a7 100644
--- a/dev-python/blinker/Manifest
+++ b/dev-python/blinker/Manifest
@@ -1,4 +1,3 @@
-AUX blinker-1.4-pytest.patch 882 BLAKE2B 85cb6c2b7a3368f94b9c2df65b44bb070149a25b971050a50c9b310446878c1e4d8ff7acdb4f5cef4927af2ae219a83607ebaae204ef919b2ba41a4cd03c43f7 SHA512 95c786a217f97a4312620bd4c026fc2efe073e3ea9d7b601a848ba27a45c9e81e08cc356410e972d0d4de816e697ac591db62acfd2a51da2229f2039e6145383
 DIST blinker-1.5.tar.gz 27022 BLAKE2B 1e80d73653318ec6e263c66b8d5d3433ff1dc05e08af03442d99d83a9823b728fee86e6e64864932aa4961b11d28bee8ad7d6f56be6dbebd6dac48e610cdb835 SHA512 b1880fdc974be63e16e2b826bdbc8ee161bc0234591b8b41deed937a1e1b9d0bf1fb697c8e94644de9cc1900aedd39d08cfc3e59fef51abec295552f96418722
 EBUILD blinker-1.5.ebuild 706 BLAKE2B e7f7fdd0122d977192419ca20007a9dd1bfa4726473de03a26ec9dc15517be1c3c3cf1649825ad2b0a7d673c2445df4bfc3dcac7c029477553aa95776505abb3 SHA512 da5ca467ab1def312f4dec14680d404b89dc192f711117b392f7e80ac8501836391b1b1d3a57f9c45d44d01a868b74b116b3ad979fbecb380a14033dacf8dda3
 MISC metadata.xml 335 BLAKE2B d244e170c8fd902544dc485af737730e99c77bf4004f638054e20a2c4a40979c30bfbe0a4b6d8cd6aa3101f27b4eb2a2d7197d8541aa0944601f501557c44b8e SHA512 b43703a1475f0bf2b9b17c2c5e87a3e700a72974a6ac72ed037e39e01ab0ee406b6e522b63e38d84911acd75df4f7a4686f1c30ba8d5673f48b47434907fd502
diff --git a/dev-python/blinker/files/blinker-1.4-pytest.patch b/dev-python/blinker/files/blinker-1.4-pytest.patch
deleted file mode 100644
index e5c2b04998b5..000000000000
--- a/dev-python/blinker/files/blinker-1.4-pytest.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8238e16c699ce7f99f5ff3f80d03d332d72015f8 Mon Sep 17 00:00:00 2001
-From: pgajdos <pgajdos@suse.cz>
-Date: Wed, 8 Jul 2020 15:22:19 +0200
-Subject: [PATCH] use pytest instead of deprecated nose
-
----
- tests/test_signals.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_signals.py b/tests/test_signals.py
-index 2d6a65a..e74db47 100644
---- a/tests/test_signals.py
-+++ b/tests/test_signals.py
-@@ -4,7 +4,7 @@
- 
- import blinker
- 
--from nose.tools import assert_raises
-+import pytest
- 
- 
- jython = sys.platform.startswith('java')
-@@ -227,7 +227,7 @@ def receiver(sender, **kw):
-         pass
-     sig = blinker.Signal()
- 
--    assert_raises(TypeError, sig.connect, receiver)
-+    pytest.raises(TypeError, sig.connect, receiver)
-     assert not sig.receivers
-     assert not sig._by_receiver
-     assert sig._by_sender == {blinker.base.ANY_ID: set()}
diff --git a/dev-python/commentjson/Manifest b/dev-python/commentjson/Manifest
index 2c7b671b1608..d9aaa02cf550 100644
--- a/dev-python/commentjson/Manifest
+++ b/dev-python/commentjson/Manifest
@@ -1,4 +1,4 @@
 DIST commentjson-0.9.0.gh.tar.gz 15297 BLAKE2B a857b0fa5551079d3d37bff94fb51a903e998c4fb84e0f62a5de28d6eafe0cb8a38b3215515e72c56de0cddb661f109921c801d15b9ba93771290135adaaa5b1 SHA512 cd3d28adecbc445ed3faed7847c65a23829f408cf8aa3fa85544a0f0cf9fa5544b8aff560725cf51921f249123daf9ce9953069e99ca64a312bb4bff652512fe
 EBUILD commentjson-0.9.0-r1.ebuild 801 BLAKE2B 30814ef36f082d6ef81f6210a6cab42978ab9190b8e9429f2640e08eac366455b5a8c17850aa2f42d643de2379910461fbcd89f2e5661cf6d94695f2456d1e8a SHA512 f64e4338cf9fd7368d8ce7f105a1cbc434a94abbe14936fdf9d822ec4f7246748f757bdfe4a759674bd89dda12b1a1a78eff991fa580273ef579c8ab724b9314
 EBUILD commentjson-0.9.0-r2.ebuild 834 BLAKE2B 3a4ff6d2b348a599b0b3f83a34e5d01030885823d5567741af7e67495c558aa1382f6e301efddf0cb7bf6dd1dc4550023d4baf3f3b0d7b8bcbfac1323d3dfacc SHA512 ab2b455524a7c07ef216f3da01deceaf24aab288dccf6b450700db298f86d274c8b89839449e0f4e33ba887cb81bfae19d2ea4d4e9bec1fe61df9263eb7c912d
-MISC metadata.xml 351 BLAKE2B c572a2399353ef88fbb0bc49d31eed6607fa157340c3ccc1311a1e2103a5488f66ed09f10d73daf2aa9a062ce36d2635e4bf703a61a9e4e7341b70e8ab1a97a8 SHA512 90aaec57bf7a92233f7761ee780faf9607dfa79d93627fc3c17cbe63aa6d2b41cdc7229fc17e46c2eb155a5749aee379a1a665e3192f44910aee344c89fe6160
+MISC metadata.xml 375 BLAKE2B 7391dadca9ed1ad8c62515f56347a04fe099c5020b2cfb5d6037e1057199f20a9a512c90800f81186bced7a8ff3f192b36e8c83d7d5ca2b961ea5f5a0e799e80 SHA512 005e5180f3f69d3c162b5ed113840494e0afbc9c09b5c4f02bad97ed7bf5a77e4b7806462f9c7aa3ca72d5d963e5d4b85a591e6e557742685c5738d66214915e
diff --git a/dev-python/commentjson/metadata.xml b/dev-python/commentjson/metadata.xml
index fb8178be68ab..e3123799bf5b 100644
--- a/dev-python/commentjson/metadata.xml
+++ b/dev-python/commentjson/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">commentjson</remote-id>
 		<remote-id type="github">vaidik/commentjson</remote-id>
diff --git a/dev-python/confuse/Manifest b/dev-python/confuse/Manifest
index 5be781378e07..75428dac0d24 100644
--- a/dev-python/confuse/Manifest
+++ b/dev-python/confuse/Manifest
@@ -1,5 +1,5 @@
 DIST confuse-1.7.0.tar.gz 49171 BLAKE2B f102ed445d4fc259739305f745fea6c1fef90fe4d8eb7b77bb6c370d37929807478df86ad78ffc8fc2fb1d4cd7033d76e34d880d6dab6721b5fd6cc0e7f5d02a SHA512 0da6cb237aa31f63cf6d2df2e90eb27e7b1a81bd126546a4314425b9dc1d9f993232b4787815abaf7ef4b54ef03ac3286c321e6654fdf18f05f92aa69c3da78e
 DIST confuse-2.0.0.gh.tar.gz 48269 BLAKE2B 58b96ab65da7b48236b798ad5546a72f0f74934c42525b26b44c0aad08ba4de385dbc2dd6915a4b570b1c4e59003e23119f0da80cf84b1bbc88abb9f72d4d8b1 SHA512 53732ef24903bc464f4cda0c9a2728814ff286c2e2a2150b4703b61f925d5bf77d75b98469a4fb92267caeec736e51d33285264f3fd8daa4adaaf23fa9511733
 EBUILD confuse-1.7.0-r1.ebuild 594 BLAKE2B 295b99da58291a2204b9e00390199e6ae9363f2f24d60915c8fb6d77c5a14244a3deae45f55d1cd7fc649c0db688e05c7a19008d7b4c808acca15036ebc75089 SHA512 96e9a82f7c60ab27435a4385d559497805b5548ca51b4bef56ad307cdbf4034f7f39042b32618d3d5a11f8e6affc4b7ae2f72f88420f752660166981f74aadd9
-EBUILD confuse-2.0.0.ebuild 642 BLAKE2B a28926d49d6ada44c3baaca70b55f142605f109dcb61572ce8c2659b81dfc77e642bcc63624004c56f2d9fd4be7bf2e060141e0852a2bbf16576dad740561c6e SHA512 958ed8bbac51a3c30dd1e9b94e1a3e873aa54ae2e72ff77e61adbf687b0067df425849998972bf48e17801e58efb6110eade31a37084f8ee9d6015225a9faf11
+EBUILD confuse-2.0.0.ebuild 641 BLAKE2B 7f1ade52797c1170067fa649173653bf2da9a481a5e1eec1c7bdcbcf67a266777ce913ba1b1f3693590b689fb46a3cb3404a1f84bcd3b9ebf547a57791e20108 SHA512 4546a97dbf9166f7b6a7f637b0f1703c314533814ece2c75bcae38dafca66caffebbbf5ebec00850499d3d2ada928c91b4111616bd4d498b817021622d08a6f8
 MISC metadata.xml 878 BLAKE2B 2c3a52104c43764bd91ab68c7706013373ab30fa0fdb447bd5401f986ac242b1935268ced5fb70657d44ae2539758b81f8956eddcb0656c7dee70be292e240f8 SHA512 64f959d0ce18e4fb412f482712101117f8f824f333c0befce184e736b52897dd105a0d9d71d65eea57bb21d724e2b69661f9efcaffa36536c61d9c6ae2d2a522
diff --git a/dev-python/confuse/confuse-2.0.0.ebuild b/dev-python/confuse/confuse-2.0.0.ebuild
index 2a48b8b1241c..e95924189613 100644
--- a/dev-python/confuse/confuse-2.0.0.ebuild
+++ b/dev-python/confuse/confuse-2.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-python/future/Manifest b/dev-python/future/Manifest
index 2f53b0769c72..5dced2f17c48 100644
--- a/dev-python/future/Manifest
+++ b/dev-python/future/Manifest
@@ -3,6 +3,5 @@ AUX future-0.18.2-py39-fileurl.patch 1005 BLAKE2B 9446c90649e5c06c1d603041c07e81
 AUX future-0.18.2-py39.patch 2789 BLAKE2B db6c0cb0a030d166f01b95721e560d346f8a80ec63f81c58e5fca663f975b8f8f771d169742a421c34c08b0de01069bb5455b5fafdab440af6e73746df0bb24c SHA512 7bb140d526d2e728d5a988898977e8bf87934f68c42a38f97717b3e5fc040ddc736cdb2b366a8dbbb95c857bffee9f448ff1883dff9c61cb46582d3a01aad65f
 AUX future-0.18.2-tests.patch 11773 BLAKE2B e2b9321ab2a04e4567c312beaccd23886c87f8b78c1de5d480205181a68b77d8c8b1582a57f43e510d5cd3ecc54252bb85130fe6d7e82756c9f1db11263fdf7b SHA512 d884d6b4e320a6e2aeca2c0c46576d9b0fd0d31aaa6f8f9a79f2007ecbc949f1393aa0b9254f0c51616ca4e8d3fb3f11d828879e4e8c01549acd4ecf04e2cf68
 DIST future-0.18.2.tar.gz 829220 BLAKE2B 68574b589bf54aa8dacbd162a54885589faa32829ccf212f50de5bf036ebd8b9aba0c13e63e80d34e507cc0dae4d8d3d47fea33433b17d2c2e6dbf6c37f66d8f SHA512 91c025f7d94bcdf93df838fab67053165a414fc84e8496f92ecbb910dd55f6b6af5e360bbd051444066880c5a6877e75157bd95e150ead46e5c605930dfc50f2
-EBUILD future-0.18.2-r1.ebuild 1112 BLAKE2B 490d02975c21c4b97260c54fb99cf4451781105fdf458989a4a389b5e2d48541be0e0a9088527e529f3e3ca1ed7a4b0d87d1067cfcbafe4d2f7b3a4eee844810 SHA512 8545772042747b907210f942255574af6e10c38014aac52fe315916ee92b42604dc821898d796b9068dc34c242a832d280a1cda10d22196e94659b2300c2951c
 EBUILD future-0.18.2-r2.ebuild 1144 BLAKE2B 7d7adc1e620acaa1c194eb0aad0e647aa80a8a23e8611a6fc777e548d6a8fbcd9294e255564a11a6f1dc2b1e6d2045707494ee97d493d5f31f3b9a29764984ad SHA512 38bd9df88bc0545daac2649effa4db53dd33d1c6d1d83811644fad550ac199472496c5e98dd6040e2d6f0684ef5f9e1af571bc20f18ca15e62f87ff0fba4fffc
 MISC metadata.xml 402 BLAKE2B 84957a57a39c658794b57e41e2e683d826a6e5b7e1006f0430034a29b82d12f2983b021c63e9d519fe6ea21a90f30822b5561001c7e9283ea770fedb1d40ad9c SHA512 e1a2dfb08304d2cd0751dbde1e1410be0805493bf7624db17b3631dc10051fb443758a0c750ced2846a2769a3d33da752002ad7e92f95d88b4060f7a8be995bd
diff --git a/dev-python/future/future-0.18.2-r1.ebuild b/dev-python/future/future-0.18.2-r1.ebuild
deleted file mode 100644
index 1ba5646433bd..000000000000
--- a/dev-python/future/future-0.18.2-r1.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
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Easy, clean, reliable Python 2/3 compatibility"
-HOMEPAGE="https://python-future.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_USEDEP}]
-		' 'python*')
-	)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx-bootstrap-theme
-
-PATCHES=(
-	"${FILESDIR}"/${P}-tests.patch
-	"${FILESDIR}"/${P}-py39.patch
-	"${FILESDIR}"/${P}-py39-fileurl.patch
-	"${FILESDIR}"/${P}-py3.10.patch
-)
-
-EPYTEST_DESELECT=(
-	# tests requiring network access
-	tests/test_future/test_requests.py
-	tests/test_future/test_standard_library.py::TestStandardLibraryReorganization::test_moves_urllib_request_http
-	tests/test_future/test_standard_library.py::TestStandardLibraryReorganization::test_urllib_request_http
-)
diff --git a/dev-python/html2text/Manifest b/dev-python/html2text/Manifest
index b3becfd327d1..74aed748aa96 100644
--- a/dev-python/html2text/Manifest
+++ b/dev-python/html2text/Manifest
@@ -1,4 +1,4 @@
 DIST html2text-2020.1.16.tar.gz 49464 BLAKE2B f0331daa63b9e5d7508e0446e19b4dd4d05e5f7af0279efd71dc43b633f8273666189899a27cb598e8afdd5bd8ffb3d566b97327d82870ef44a81310d8e7e7c9 SHA512 14453c98e81d05afb3241b04a9e50caf63e4b6f857337b4bd9f53e6b8fa7146aa6a1f4f64777db9fa350316b19fe62a0033dce5748191ca9fbd17a8757002855
 EBUILD html2text-2020.1.16-r1.ebuild 697 BLAKE2B a60d2cc00a4af95494784763d4e0d1d7c1548c85112d53d38e641ddb2128636c99dff3a2d64c9da348fb46967db574a462db644247e1edbd196b5838390a1670 SHA512 67925501194270fd7bf0d998cc3f2d699c7b7c7bb22eda8df57880d46ee6d5c8931354863a2c6cd96ad36268378777e404428839f6b46a9f9d74a857cf701710
 EBUILD html2text-2020.1.16-r2.ebuild 720 BLAKE2B 67102c344a9f189efbd031e5c3c28197144ad59febbaecc82ad3e7581e302b7b69960522cfcec1d49a5fb61c8e0f757ea3f48cc3ad9337140fc7f72abbcbfa1c SHA512 76e50ec2de2f6e6b7839ddfe78deffef97a551cd44c09d03a428c8c189d6db714ef070471ce87b3a60bcea3f3fa10abd9d5d40b800ca1e091c2ba560c4d4adf1
-MISC metadata.xml 370 BLAKE2B 7f1ca31270b32232fdb07a3f87c051db987b727c2753fc38889141db09df1a5c637d64b4263890a41dae2a086a30ab46c36a32e83da6517854a9bf4d356c3b96 SHA512 962ce64fd69c10d7a1be71f2d9927c5f44867822e4a58e45e566b7a515ad2273dcc17ae9eb05c12ffc951fb824c76081abfd3a02a8e02d9a59e29d521011fef6
+MISC metadata.xml 394 BLAKE2B 45ca69b813241875394c5f6ac562bf6515671e22f8c802ab9197c37a7ef724fca96f8db7b5cccd5849da8f76be3a3f59c87801faa1acdd7eb908b196e6b39f95 SHA512 8a9c8941e6ab54fd5936756ba9f851d79ea3effa70cd8bbbcb05487c31e50cec6c072fe61d6fdffa009e754d1014676b06b1778daee82ae7a110f3ad9663d970
diff --git a/dev-python/html2text/metadata.xml b/dev-python/html2text/metadata.xml
index 478a2cb8fe4c..68117da1d95c 100644
--- a/dev-python/html2text/metadata.xml
+++ b/dev-python/html2text/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">Alir3z4/html2text</remote-id>
 		<remote-id type="pypi">html2text</remote-id>
diff --git a/dev-python/irc/Manifest b/dev-python/irc/Manifest
index f86442d70232..29d989cc4a27 100644
--- a/dev-python/irc/Manifest
+++ b/dev-python/irc/Manifest
@@ -1,5 +1,3 @@
-DIST irc-20.0.0.tar.gz 88662 BLAKE2B 627354a051964e53322484c8a2c28487e25738b21c485121589af331e2da59b80c5704ef4268ff0bac3e84d26f77af031ba6ce0064a46496e846c7160462a5f9 SHA512 cd54e20075e97d7c8259275514741f9bb2f93712b1cc8628399fb7d4b37ff7d1d6515be14f5326fa30e59f49cfb853b954f4f095b4d3cac870a63a9946cfbed2
 DIST irc-20.1.0.tar.gz 89157 BLAKE2B 42498e63e1d62a5c2e545f1d0d581bdbc9f49228ec14e523f4add130b903be2a736072b8ad53775a7f16298a7c57761d8c06053570dc01a338491593564b3fd7 SHA512 83a988b5f75c1d55376a140519725749824dbc9f32e6b0e5d3684d9c58973a746ae517441594cfa745edb89a0fbd98ef847e937a620548fed4e344b66a97ad1c
-EBUILD irc-20.0.0-r1.ebuild 1123 BLAKE2B 39800e4d1b9d6b8ef6aad057db63161a9f94bab7b49ca114ec9246ff83a09f87220ec0b7b7e8d5a462aa1d56a5252bde5a8670b9f4e420634c2cc5bd38dffc59 SHA512 91592ad238452fcaa68fc585755e0d44c8efd89bbefc850a6bff950891086972af4e503003c6f9e99dc909e7a88678b2f0055b1bf494b68dbb29ceaae879bccd
 EBUILD irc-20.1.0.ebuild 1123 BLAKE2B 39800e4d1b9d6b8ef6aad057db63161a9f94bab7b49ca114ec9246ff83a09f87220ec0b7b7e8d5a462aa1d56a5252bde5a8670b9f4e420634c2cc5bd38dffc59 SHA512 91592ad238452fcaa68fc585755e0d44c8efd89bbefc850a6bff950891086972af4e503003c6f9e99dc909e7a88678b2f0055b1bf494b68dbb29ceaae879bccd
 MISC metadata.xml 816 BLAKE2B 8390d70debcbbd36f9d4cf9e7bf204f108a3aa04bab4b1b7166e807899c402b94e4aca435df16c80feebe73caffe180846ae4116132111377951663dedd64b68 SHA512 04478d5d9ab60c09105e6594a19957e1aa059489f389918baed7ebd185f31cbe513ebf7816f565e40d42d27477842e2bd92ca17ba845a4a4de2e7a4f71df42a1
diff --git a/dev-python/irc/irc-20.0.0-r1.ebuild b/dev-python/irc/irc-20.0.0-r1.ebuild
deleted file mode 100644
index e8d85bf4facf..000000000000
--- a/dev-python/irc/irc-20.0.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="IRC client framework written in Python"
-HOMEPAGE="
-	https://github.com/jaraco/irc/
-	https://pypi.org/project/irc/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/jaraco-collections[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-itertools-1.8[${PYTHON_USEDEP}]
-	dev-python/jaraco-logging[${PYTHON_USEDEP}]
-	dev-python/jaraco-stream[${PYTHON_USEDEP}]
-	dev-python/jaraco-text[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/tempora-1.6[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/scripts"
-		dodoc -r scripts
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index ac6f53311401..1b5fde84ad55 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,5 +1,3 @@
 DIST openstacksdk-0.100.0.tar.gz 1065692 BLAKE2B 7941cb9a14f10924953ad114f9bce4847b7e26bbea4622790503209ab70a01c254f2ec59d3f794f64d1ecc8f320a9a2be2db8015cccad8b20fe06dc1e72683d0 SHA512 c3e47510518bc4abac78aab654f6f8aa7c0deec3f4355ec7ea064ffa32c1862a9015806fd04cc1975c3d7e688e9c5ee66e3837baa21ae6c82db8f39b4b8f8330
-DIST openstacksdk-0.99.0.tar.gz 1060314 BLAKE2B 0c8f641e301ba4fb8ca83e651f85f8ba98aa73904b2e94b15b17d99354aace5b73ba243c4e624e4c53dd7fb1deb147801aee93233f1fe019a0068873530bdb37 SHA512 5e15f29002231dbad15e7a2dadaa97e64ed191389d259222880a7e40984d6fbcd9d1602a041164e4f819141417d108a179171b4c1430947dc5c5e9cdc5409aea
 EBUILD openstacksdk-0.100.0.ebuild 2725 BLAKE2B b782b8924f545825e6123e535db9310f5e4b8627e3a8fa87fd420ef76dac0c19d46f092e2459df601b3eff545b3a19ba606ff65b46be77f00707733366ebaaae SHA512 21ff01a63582b4186a0ec12e1a02b34561a74c4b13f8841644c4483d7dde423bf6a47ea9227cc5df8d3623f685e3cdb5254c70e56522077ff36d9f10f3a2c7ef
-EBUILD openstacksdk-0.99.0.ebuild 2629 BLAKE2B 93e22db864042f78ac25e4f9563531a91ea28ace65efc96c2141a602c745837c8bf7d72caf4427717cacb9b3e4e743f47b8f059b5e5df13153892bff32fdd914 SHA512 dd98022c9cd69f395e935f516fedaec2ccf4ee810bab9e91232c8a5cd2871de343186556f0047181514e6bd3fd705daaa2b4c85c7813c493a5c88b8b37b54536
 MISC metadata.xml 517 BLAKE2B 661ad1e9eae06e7b36a5ff753e73bd4434042966cff3fd6fbc11bf70a1acc3eb8de29ad2a033d6d715e1152a5454d84077e99db3b588199b317f925864dc1403 SHA512 e6dbfbb3546c2a62b204b33ebb3bb33611079698212f098bd4da072200fe43e3bb350cc998b255ec4a15aa2ff3a04c89a9553dd7930db48e658dbcaff78526d6
diff --git a/dev-python/openstacksdk/openstacksdk-0.99.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.99.0.ebuild
deleted file mode 100644
index c93382d4051c..000000000000
--- a/dev-python/openstacksdk/openstacksdk-0.99.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A collection of libraries for building applications to work with OpenStack"
-HOMEPAGE="https://github.com/openstack/openstacksdk/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-CDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
-	>dev-python/jsonpatch-1.20[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/munch-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-4.4.1[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.7.0[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${CDEPEND}
-	test? (
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/prometheus_client-0.4.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Internet?
-	sed -e 's:test_create_dynamic_large_object:_&:' \
-		-i openstack/tests/unit/cloud/test_object.py || die
-
-	# TODO
-	sed -e 's:test_generate_form:_&:' \
-		-e 's:test_create_static_large_object:_&:' \
-		-e 's:test_object_segment_retries:_&:' \
-		-e 's:test_object_segment_retry_failure:_&:' \
-		-e 's:test_slo_manifest_retry:_&:' \
-		-i openstack/tests/unit/cloud/test_object.py || die
-
-	# unhappy about paths due to test runner
-	sed -e 's:test_method_not_supported:_&:' \
-		-i openstack/tests/unit/test_exceptions.py || die
-	sed -e 's:test_repr:_&:' \
-		-i openstack/tests/unit/test_resource.py || die
-
-	# requires hacking
-	rm openstack/tests/unit/test_hacking.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b openstack/tests/unit
-}
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 2629aecc02ad..fa3a7850060b 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,5 +1,3 @@
-DIST pylint-2.14.4.gh.tar.gz 1275701 BLAKE2B a91dee4c2feb83fb98d0782cd7bbfa81752cc00c707a7b2fbeacf42c6857819d8d4cfffd4caf897af0fd38237d881cfa3b9f57a7e6eb34bee59e0203e3cdd9f3 SHA512 ee305d880052c4e1ebf939201fb5d5d52b642b5130c3314aa91eaad1a413e33e2665a935df1f7a73a3745660de3d3f0a3bed10b2871d840f73bfd2fee651d2b5
 DIST pylint-2.14.5.gh.tar.gz 1275994 BLAKE2B 0d490e81f758cca0ff5c4108090414373c3276b3a51f54df26938e128d82b15ca976cb62d999d8b012ce1fe69b56988a385110be02b1d2a281e39d9f91cdb378 SHA512 8c4d2b17c078c305b081e7dd225a1e744420e01b27f63217f80d61e6bcd0e4f8381c94c504cacd3b8f96cc58c3c53d693fb59277ccbd396ea31f6c72af666042
-EBUILD pylint-2.14.4.ebuild 2300 BLAKE2B e24521d06896cfd5307dbed340d1035a182b42d985c59ce6750ea709aaa3658d7d4516e216751b7088c9946dd5bfef15f428c4b0f139cbb2a78731396b3229ac SHA512 3613ba3e532e7be60f89c21775009289e65a536ffae46b742a5e74bffa1f91e8f9d59de831bb479ebef1fea1fe5074816d0f3497f5a047c729b1522bbc357d5d
 EBUILD pylint-2.14.5.ebuild 2300 BLAKE2B e24521d06896cfd5307dbed340d1035a182b42d985c59ce6750ea709aaa3658d7d4516e216751b7088c9946dd5bfef15f428c4b0f139cbb2a78731396b3229ac SHA512 3613ba3e532e7be60f89c21775009289e65a536ffae46b742a5e74bffa1f91e8f9d59de831bb479ebef1fea1fe5074816d0f3497f5a047c729b1522bbc357d5d
 MISC metadata.xml 1100 BLAKE2B 97ec6bd2f6cf487afb93136e9ee58d0d5f8ad37e2ded456ed4f196e73fd37cddead2462d3592b44ca1a6c3722b1f194905238299f0c066945d1e22bdb18acc9b SHA512 0418d987879446fd76fe9b7fc4ee8b1c3c0d9bbab1d1fc3eb66eada0bc52f6b6480cf9852dc3a18b1915d2093642b9c87f24207e89b34d3e48c29a282a3ba979
diff --git a/dev-python/pylint/pylint-2.14.4.ebuild b/dev-python/pylint/pylint-2.14.4.ebuild
deleted file mode 100644
index 89b5e676d2eb..000000000000
--- a/dev-python/pylint/pylint-2.14.4.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="
-	https://pypi.org/project/pylint/
-	https://github.com/PyCQA/pylint/
-"
-SRC_URI="
-	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="examples"
-
-# Make sure to check https://github.com/PyCQA/pylint/blob/main/pyproject.toml#L34 on bumps
-# Adjust dep bounds!
-RDEPEND="
-	<dev-python/astroid-2.12[${PYTHON_USEDEP}]
-	>=dev-python/astroid-2.11.6[${PYTHON_USEDEP}]
-	>=dev-python/dill-0.2[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.8[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.10.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-"
-BDEPEND="
-	test? (
-		>=dev-python/GitPython-3[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	rm -rf pylint || die
-
-	local EPYTEST_DESELECT=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-
-		# TODO
-		'tests/test_functional.py::test_functional[forgotten_debug_statement_py37]'
-		'tests/test_functional.py::test_functional[dataclass_with_field]'
-		'tests/test_functional.py::test_functional[no_name_in_module]'
-		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_error_msg
-		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_info_msg
-		tests/config/pylint_config/test_run_pylint_config.py::test_invocation_of_pylint_config
-	)
-	epytest
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-cinderclient/Manifest b/dev-python/python-cinderclient/Manifest
index 0b3f4fba953a..1d92967760ac 100644
--- a/dev-python/python-cinderclient/Manifest
+++ b/dev-python/python-cinderclient/Manifest
@@ -1,5 +1,3 @@
-DIST python-cinderclient-8.3.0.tar.gz 234371 BLAKE2B 092d7abdd348f5fac750efb3f3f4df1575584684ad613d22c558630576ad2f82c399af671aad7070dd224a89fa01d73333c2505dc0166d2e4c70e21ac01f298d SHA512 4d633b39a3c59cfdc2fc2c6235b3b87093f7617c89a80b50cf26d8f6fd63e8c3197d788e0b9e81347b9427cf363289b09b85376512d5820031472a735e0ca839
 DIST python-cinderclient-9.0.0.tar.gz 234533 BLAKE2B 18d673cbe02c5a4221b8667d051b1e0c1cbfe0c071e2b8c2f37b37dcf4ea9adae7ee64a7d5c8663c8ebd5946be53d91e253b9fb1df75e0d7f4dd8554098d22db SHA512 66542e10041d567fd7193a577ea5e8e7de6d7f735e05b1135f5d41e88847a6d042356431f54b481d9c13ec99c56e6d898df0222737e17c21fe6be6cfa886eafe
-EBUILD python-cinderclient-8.3.0.ebuild 1237 BLAKE2B 83416e79a26d7c137d7a8871a11d5e1203d438cbb04d2719f862663e76e94ca5e5288ac25bd838468f3fa6eae4f0fdef20ddb58c67b0d83b40563022ab960c4c SHA512 e512063e57ab396f5673a3ff3334631808393b033cc764670a23a9b590e5f6caf70ddcedeb6c017c8da220b33aea40bf790fa6bf716bb623bd5dfc46d660b2af
 EBUILD python-cinderclient-9.0.0.ebuild 1237 BLAKE2B 0f562b157d1a8441fb41ff2b80ec4f3e3f0d7828356f6a12e6a223498ecae3aad862d925d643e382292fbb1c7e2948e9d0899e17df1586e75b2a39b692c8bb27 SHA512 81f10aef4f05664782698f10513a1beb28c24de9a99c1be81cd3b18d1a360bc3f24b5be4e1d82ef124464bef194a58c2f51414ee0c526f423d29028d48f0c81a
 MISC metadata.xml 727 BLAKE2B 0017cc08edf25f27b8a2816bc3ce1374148a17522bf2c5ea643ad10cde9f5779b1b6bf1e3c91627db76d2f77b8dcbfc87a29fb2cdd8064b3140fb14d1e6e00a1 SHA512 e30e64371f7a5f5fa506396f2edbbc7f862a585c7fe9af4f6fe63e99d4bbe9f9bf3a1f002a62c40ab9d75bd90ab99446bb80bf7f2fedf5b37287eeb54e5dacbe
diff --git a/dev-python/python-cinderclient/python-cinderclient-8.3.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-8.3.0.ebuild
deleted file mode 100644
index 77b4b8b22dad..000000000000
--- a/dev-python/python-cinderclient/python-cinderclient-8.3.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Cinder API"
-HOMEPAGE="https://launchpad.net/python-cinderclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/keystoneauth-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-5.0.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-4.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pbr-5.5.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.25.1[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-3.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ddt[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/oslo-serialization[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b cinderclient/tests/unit
-}
diff --git a/dev-python/python-swiftclient/Manifest b/dev-python/python-swiftclient/Manifest
index 76b636504b6d..c281ad40831a 100644
--- a/dev-python/python-swiftclient/Manifest
+++ b/dev-python/python-swiftclient/Manifest
@@ -1,5 +1,3 @@
-DIST python-swiftclient-4.0.0.tar.gz 200490 BLAKE2B 37cadf27758640a916014e09309282a4b7ffebb3e578ae7411744fafd22431cfb748cffb4127309b20a8b2d8daca7f8f0a1ed6431f55766c33b243744ce5a71e SHA512 9058558564973ea2a4944e87dedd7b9b12e106672576da1d796eae336d3127ce8b35803cade93c605b38fd16a2d3466e6dc710838ceb77143059007625299360
 DIST python-swiftclient-4.0.1.tar.gz 201300 BLAKE2B 6a506ae8996a3937048f67e7b3f8e5185605f9e5fe955f23e1131eead4d3699fb01e7851ab632e3dfaa75c12e88ec17cec5b4c1b19c1663163a2ff95530561ec SHA512 0028bc12a9694047e31da3c05fe92ce846de8858743771281cc9b93f0826c596bb6ed5ee72f4e5c68c4bba2dbd9f311062dccdf13c9917536d2aaec7eaf33ef9
-EBUILD python-swiftclient-4.0.0.ebuild 1056 BLAKE2B f238ad88b6d5af2b50a97ea8d9609223e051f9540e5d83ff1a59ef006609d4d9243e5ffcc7169ef8315cff903e36bf321fbaa0f8d1d81297eb9be4a591525dad SHA512 70a794f5441ba89d9fe557d532b7de99b0abddb415683023f0b8587cb187385ad6cc13773d5c87e9433b0e288f2248b5a6b9575e1c8df46da6878a6b4c0c9859
 EBUILD python-swiftclient-4.0.1.ebuild 1056 BLAKE2B f238ad88b6d5af2b50a97ea8d9609223e051f9540e5d83ff1a59ef006609d4d9243e5ffcc7169ef8315cff903e36bf321fbaa0f8d1d81297eb9be4a591525dad SHA512 70a794f5441ba89d9fe557d532b7de99b0abddb415683023f0b8587cb187385ad6cc13773d5c87e9433b0e288f2248b5a6b9575e1c8df46da6878a6b4c0c9859
 MISC metadata.xml 623 BLAKE2B 168e5384739e27a69e799a4e94038a8b7ba8434a439f92f601657ab4404c2f610da2324364a73c982aadc39a691fc368099b0ed604209331e9d83a33da1ece67 SHA512 d3028eb4ff16c9baae166c749c40388d45627a583ce041ece508f66cd8eea2f5f1ab72eed930c860497d6cb1e3e7f03c20f165c661197c4e507bf5a2c6833d1d
diff --git a/dev-python/python-swiftclient/python-swiftclient-4.0.0.ebuild b/dev-python/python-swiftclient/python-swiftclient-4.0.0.ebuild
deleted file mode 100644
index 4ec90b98b6ca..000000000000
--- a/dev-python/python-swiftclient/python-swiftclient-4.0.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings to the OpenStack Object Storage API"
-HOMEPAGE="https://launchpad.net/python-swiftclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-		dev-python/python-keystoneclient[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/openstacksdk-0.11.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	sed -e 's/test_password_prompt/_&/' -i test/unit/test_shell.py || die
-	# fix duplicate script/entry point
-	# https://bugs.launchpad.net/python-swiftclient/+bug/1975361
-	sed -i -e '/bin\/swift/d' setup.cfg || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index bd6976d08920..9990619e3db8 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,4 +1,4 @@
-DIST sentry-sdk-1.6.0.gh.tar.gz 249637 BLAKE2B c4d6788c80184ce9127ed85dfb5305363fd27bcbebd74763e4c14c4fed35dd05069ad4a244fa2d8a59f8cb618df22d4d864bf72510fe42600d23fcc6bf8228cf SHA512 d2999831af595ed7f1861ec78887e46887eea8c4c931f22bd4003aede508511287f67eb6100232362a110d16b7bdec892572225440be52a9bd37952c30478f15
+DIST sentry-sdk-1.7.2.gh.tar.gz 254370 BLAKE2B e65b2236bfec9279a4aa05b77c9492547f657e461a7c96c4158acb6bc0887571186bfa71893dce34251ef8d783fb5d583b25aa12539c5db7993cec65fdf05229 SHA512 9fe2c283a326b78c8be95500e4916bb633dc7369960a4e0ef69c0f29de74c38db81f43b3931c47d50431ee7f1a66a2b18e8c4fc02ce71c404a5e9700644cb76c
 DIST sentry-sdk-1.8.0.gh.tar.gz 286488 BLAKE2B d47f33a1c83cfffa6e4a801a6fdfde132d4cfe1b734e464c4db60e97abf53ebe503c53c3edd89d1a84e655a348a4463a75c3475d4824d03cd9b95733b13b5532 SHA512 aa3be96dbc55265f17371d8f20f8b3116b4310cbc1d078b62beeb1fd90bdbb840db85c25309e16f793a188d373c6dbcfd11a104db21b60221a5fb06d8deacc2d
 DIST sentry-sdk-1.9.0.gh.tar.gz 290271 BLAKE2B fcb4c45c129faf23a1177167e2bdd567a7ff228abbaa782676abb16c29e9c4cccef89f67ae5cd28c4f2b25e6687152fdc5eab0c7d981021a8df16374dc4e1fec SHA512 4f287bad8e9dd8eaad8f8a31d7335ccf6bfe72cc0ba8c0b26abcbd7e326bad886709d001976966a7b917f39e1ca249fa881abf29778cfd4bd65c63f05a6f6ef2
 DIST sentry-sdk-1.9.1.gh.tar.gz 270398 BLAKE2B 66ee16816d312b38df737c5ecb0ecc4a2189c932c162bbedf165f2a153029e95c389372a4638d5f71f669ac780710769e4708c3e7673573d1b1e79a29cbf93c9 SHA512 5997252aeee900125e42d7275627359ca5382707162b93e45b238c11a181ac724fea327fa1b29deed63dbf800463d10c9d2a8e8943c32b907e4eac055e399297
@@ -6,7 +6,7 @@ DIST sentry-sdk-1.9.2.gh.tar.gz 270400 BLAKE2B 690e62c1b4f64677442ac46b15973173d
 DIST sentry-sdk-1.9.3.gh.tar.gz 270453 BLAKE2B e971c89ccdbe3831e49cf48db4673c54f4110878e45e92bf5f8142a876b8382fc714e9e3fc124c36495c8cda24efabad9486fc0cdb939a034c931a718e21c501 SHA512 4a31507635cbe3932ecb548273f32cfd6098d5ed4eed2771a37b79f98a4c97f12d50b89f63f357424355d5657bc2bdb3e49f0984db4e9c9ee7ee31b984d0367e
 DIST sentry-sdk-1.9.4.gh.tar.gz 271140 BLAKE2B 07ba10c72ec61c1bd6a54899712b5880ddf4c4f67ae9f127184d0251e93ae0a7374441ba77eb54c871684152613db55a582ca98f787884ef834f658d743abccd SHA512 2b0089b29da002e6236b93033f36bc0a6ba08d4643021f6bc2e30807a84867030dad088e1ff6b917f5b9dbc2da06305c3e58cdd9f9c10009df5063640cb8796a
 DIST sentry-sdk-1.9.5.gh.tar.gz 272096 BLAKE2B 179be647b92a74a1836f26add33e4b98007d19eff7454eb4968a2029003b7c1601d2eecad162a109508942b2f65086db32df6191c7f7986b5ab831295a8d3775 SHA512 d909ea9552a845b7022fdbbd06e3c49b2f136ca66771f20cb74b82f9eda7f63bee6c095eddefad7623a224bb9d6bf2b775c3c9405a0b55cd520952c3fe67c22d
-EBUILD sentry-sdk-1.6.0.ebuild 2870 BLAKE2B 1bf7978f3df6c64385e0010c8a65d7c3422ac8f7180b2507afa688b739bd14df2cd53ae698e8f5f0b25f5203ec4e1fd6eeae33cb4b75358be2490ddedda13fe9 SHA512 2b4657cd4b1076cfba36034608506e6bfe7d930e5e7db4641ff2f56602741f88be40226581371ca1b18ed35d612341038b9f9ebd16cec427baca18816d34caa6
+EBUILD sentry-sdk-1.7.2.ebuild 2870 BLAKE2B 1bf7978f3df6c64385e0010c8a65d7c3422ac8f7180b2507afa688b739bd14df2cd53ae698e8f5f0b25f5203ec4e1fd6eeae33cb4b75358be2490ddedda13fe9 SHA512 2b4657cd4b1076cfba36034608506e6bfe7d930e5e7db4641ff2f56602741f88be40226581371ca1b18ed35d612341038b9f9ebd16cec427baca18816d34caa6
 EBUILD sentry-sdk-1.8.0.ebuild 3125 BLAKE2B dc87ed38983d2d0affd1cf18b3acdc0c2ae6f4b0105cb24d72afa4d19b20df8da823264821974b7b5ac21a8559bbf617f118b4045a09cba8fc923d6c0cd0086a SHA512 d15338c869daa70b9d834305246fd9add6988909c4192b6137fcc38a950e75c9280e2d5190c14ffdfaeb6256117d34189f31ce1d8fe305fb905cb3e3d10be8ac
 EBUILD sentry-sdk-1.9.0.ebuild 3205 BLAKE2B cc50ae93fdb72f81c15ac975cb7359056feba2eb1f67b77335892f784be8f859bc5125fc341f370eaa4b1b3526387fb12246046b1b0d9db52d364f796c440236 SHA512 e78cbc57645b20a02a691cca4849f9728d95eaa10fc55ac035111b50b24b1d8766875a66db0306256b446c2a47a797d2d890ed11ffc1246e6cea43e243b97379
 EBUILD sentry-sdk-1.9.1.ebuild 3205 BLAKE2B cc50ae93fdb72f81c15ac975cb7359056feba2eb1f67b77335892f784be8f859bc5125fc341f370eaa4b1b3526387fb12246046b1b0d9db52d364f796c440236 SHA512 e78cbc57645b20a02a691cca4849f9728d95eaa10fc55ac035111b50b24b1d8766875a66db0306256b446c2a47a797d2d890ed11ffc1246e6cea43e243b97379
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.6.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.7.2.ebuild
index ac1650bb3f7f..ac1650bb3f7f 100644
--- a/dev-python/sentry-sdk/sentry-sdk-1.6.0.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-1.7.2.ebuild
diff --git a/dev-python/simplegeneric/Manifest b/dev-python/simplegeneric/Manifest
index 61eb4651b76e..433c7ada9e1e 100644
--- a/dev-python/simplegeneric/Manifest
+++ b/dev-python/simplegeneric/Manifest
@@ -1,4 +1,4 @@
 DIST simplegeneric-0.8.1.zip 12663 BLAKE2B cc3d70f8f4f04209b7ce259c6caaccec001515a3da04736cb8baa5fe7e6091f4f85bdde0c5c4227a01bfe52739f51ab0116d8bfdc4bb58bd2188c3a54c5eac37 SHA512 74c25d4e04fe197058cb43fabe3702cc5901989dc0b0bcf7511369f4f3d90fd98e4225174db0680c8f39389914f82824bdbdaf4c302b53998fbabbf0dba393e4
 EBUILD simplegeneric-0.8.1-r1.ebuild 527 BLAKE2B 64cd198525603bb492dd9bafb32ba57e9948746d2fbb3c980e3ca5465810ae5415b42b567f86fa96f3b0d4dd188c849815983c501747f89794841f8a5081601a SHA512 26980fee6afaa01ec6b5e737e3cb938670ec8db7bf004ea0fd999800eb4ed0b0531396305a0419beb9e9f2016267dc99fa4342f343c0fb07feb1d94f6297a8be
 EBUILD simplegeneric-0.8.1-r2.ebuild 560 BLAKE2B d831044f6c76696d45e883405479bb29d9d0d4affae4475bba7e260287df6d0fc12342187118bf4eb37182e395b89d8d5e5836a006d600c490f248d76a2269d5 SHA512 66561d7f5177146ac777243e560638155627aedbd1b650512834a1aef8f1fa08ff13689186af5a3e3e82e1cee46fa3c5dc4700667c9f829ef4bb3c82d9e1d007
-MISC metadata.xml 733 BLAKE2B 88889e26678b81dc9b4ace8b4e02e896be9310aeed05859925dad1f3b3a31f5bd431b1336cadd6feb91e637b90fdcb96f5ee53ed1a963741e2308e6fc84e4881 SHA512 6abd7eec6fab90f5a42bb6e043140f7784ad6a602125e6086d1616f4e1c6155c98b0471cdb4041e1989d0d9995d34e38e8b2d6a447443ad514bd91652588be44
+MISC metadata.xml 757 BLAKE2B 413fa1c6ce55944c3f0b66f4bfc496c88eb1499603529050580f3df48bf7674c9a590aeea27c9533e709e33c61716e7f54e052c00261e81879069b91ff2928b6 SHA512 158c130fdfef00b5c2bf953f4d1811e5802438e2c4d6467f53b97879fff6aa93793f04d50de8ba65f41131fe7ece42327afdb667cd03c2021975fb11a6cf2267
diff --git a/dev-python/simplegeneric/metadata.xml b/dev-python/simplegeneric/metadata.xml
index 348f365dd42e..d25c0a26f03b 100644
--- a/dev-python/simplegeneric/metadata.xml
+++ b/dev-python/simplegeneric/metadata.xml
@@ -13,6 +13,7 @@
 		e.g. pickle.dump() and other generic functions found in the Python
 		standard library.
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">simplegeneric</remote-id>
 	</upstream>
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index c9c837bfca03..fb9ca544bffd 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/mecab-ruby/Manifest b/dev-ruby/mecab-ruby/Manifest
index def5f7e19be5..186c2bdbc97e 100644
--- a/dev-ruby/mecab-ruby/Manifest
+++ b/dev-ruby/mecab-ruby/Manifest
@@ -1,4 +1,3 @@
 DIST mecab-ruby-0.996.tar.gz 48723 BLAKE2B 205cb2764327ed9e377bc94d65711555683bfce55e87b7a2cc4a985df5078b598c932fff23aaca889040295b96ebf59b0acbcfb638e42f71c6ed338a2b9a6e37 SHA512 a6beb9992d441118e4d824a7c8378bc1bd86d232a843e2327ab43cac0e0b1bf65c17f27ca8787f336c21796c77f4e8c350813e1ee84f7938654d1dcba876b4db
-EBUILD mecab-ruby-0.996-r1.ebuild 737 BLAKE2B f521a517a3e7c39cf8cb508cc79c74fbcdf943487991465033bb20e9a4a2eef0dbed053f31a43f6e38f4a594538911cc1c0adaa699a83d6f6ac417c328f07381 SHA512 d2b745fff5035fa514c07e66640a3e682cede6e3aec40d36b7677e88d261d2f25cd163aaeec87ca3ff585d0d582d9002c4aa3a5e23fff0a6f7cb9fd1dbc1d48e
-EBUILD mecab-ruby-0.996-r2.ebuild 744 BLAKE2B 7e768213cf7e7f5e259bb942aa44699e1c8a03d51f737e3001dbad08012146b67d3d534efbb5d28803da6a349ee34193264d391f897fc565f57772eb569257b4 SHA512 90ee9aee13d591401b2f0e9cd64f588ec4ab1f4326dc05d84864d3fc3d0c8c4eea08e6686996935612367ac63c3903fe3da56b0360d6427b4379ef73813bead0
+EBUILD mecab-ruby-0.996-r2.ebuild 743 BLAKE2B 682d27c785926389d8a00cb8e55c98b8633627bf26bac29a56a855a7419cbdf0bcc0f398be97eb341c1c74078dea7c93367447419f73fe60cc29642308d9e3c7 SHA512 e36e84767ca59376a3ae530ba1f111aef6faabaff2c5d289f3d1795475ea50a906e74faa6a8b670e69006764957b0f7e968bf8ac91e876ca24f289ed060b5f84
 MISC metadata.xml 413 BLAKE2B e30f9d8b15a3ab4419d79cdafa6615e9d7d353b62732b4e5bb819396f22ad951d485317b1da5d36f7e471fed9037d6efc9753e7e0f26e0c6b73b4501f50e1fc9 SHA512 99d12f9ea78a09e7b4230b8520a18d3d8c8d8d99cf77703c8a0bdcf7df63f3de64e8cdf30df7d046f5e5f98d2113abcca9c25de7671edda51da1a4e6fbc530bd
diff --git a/dev-ruby/mecab-ruby/mecab-ruby-0.996-r1.ebuild b/dev-ruby/mecab-ruby/mecab-ruby-0.996-r1.ebuild
deleted file mode 100644
index e1ef087a3172..000000000000
--- a/dev-ruby/mecab-ruby/mecab-ruby-0.996-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-inherit ruby-ng
-
-DESCRIPTION="Ruby binding for MeCab"
-HOMEPAGE="http://taku910.github.io/mecab/"
-SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN%-*}/${P}.tar.gz"
-
-LICENSE="|| ( BSD LGPL-2.1 GPL-2 )"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND="~app-text/mecab-${PV}"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS README test.rb )
-HTML_DOCS=( bindings.html )
-
-each_ruby_configure() {
-	${RUBY} extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1
-}
-
-each_ruby_install() {
-	emake DESTDIR="${D}" install
-}
-
-all_ruby_install() {
-	einstalldocs
-}
diff --git a/dev-ruby/mecab-ruby/mecab-ruby-0.996-r2.ebuild b/dev-ruby/mecab-ruby/mecab-ruby-0.996-r2.ebuild
index 65656b832723..107ad70bc2a3 100644
--- a/dev-ruby/mecab-ruby/mecab-ruby-0.996-r2.ebuild
+++ b/dev-ruby/mecab-ruby/mecab-ruby-0.996-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.go
 
 LICENSE="|| ( BSD LGPL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 DEPEND="~app-text/mecab-${PV}"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index e6290b6ebd83..95e32babc527 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 91fc99f0cf12..1d6c2324db1d 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -24,6 +24,10 @@ DIST cmake-3.24.0-SHA-256.txt 1646 BLAKE2B f41c0e2f280258c79c0d269a8249dc2a5e661
 DIST cmake-3.24.0-SHA-256.txt.asc 833 BLAKE2B 828f1130930635ad78b6829d8cb1780d9fb9a45edf1650e19a2869d18fd3225d869c664d28775a9b29934f1e3958dae542de3a37e5e3aa965b1704c512b2ee86 SHA512 dc0c495892716643f6ce1015240c373c6145ef070b35f7229d8f109a9bf4c771b49da6672ba765f69c293ed438e26afcab4bb6fa8a3c36f8b4ac91b49b6782bb
 DIST cmake-3.24.0-docs.tar.xz 490472 BLAKE2B f7dcbee55473add99406d8956657098f78e49eb30df96d73dfc8affc2ee4aca19159956189511e1cea821974e4741fd7b1c5d28f6e8f9cc31ace80c6c504b27d SHA512 dc69388e8ab20eae3c447e95f7d1b0c153a537ae81d18ac4dc4117a7df5348a2a9f35ce8c6c18c3fabe34f7d9ce3dc3f90f2323789c65c089679abe9e359f1f6
 DIST cmake-3.24.0.tar.gz 10395167 BLAKE2B 72b75e3fa4ae1710f5e5d1ac4e356a723ec1b197c9121cd73273f079f7eb31e61fbd5acab228e9b5696c4f8ab85213da4a6cf8e35068f3ca776082742084ae6d SHA512 91507fc0643f2de20e37cd8d6a539d8cb38a80b604bf77de8e88c8446b6d7b6d02b7329d58966dc2412c6c75edcb9dfbdae02fe84965fefeb7ca47f87631fe17
+DIST cmake-3.24.1-SHA-256.txt 1646 BLAKE2B 0b72b78803e6b6e8055f68895203bcf8e4dfd0fdac43113bcece89d022ae38428c8363e12182f23954ae529a3e98d64c16770ad53f597a6d4100a72053ce10f5 SHA512 6302a8f3370f94415af6a2a1852b15f56fb58a67f895b3d99c6f2a084dd99437a94cf48bccdebed5b96e20aa9f52daff87e1037f1c62aff21b7a138f051375cc
+DIST cmake-3.24.1-SHA-256.txt.asc 833 BLAKE2B 2e77922c732e654b40a40043b85ec4794886107cc09765d0a80ea05efad08711046bafd5ae341fb16904129cc7af75e6f4d2d1103e767a9147cca6a6a975b1fd SHA512 b04a73cc483d51d5eafab7153b53e366220db2bad4b1d78fea9aec82e667434b8a27ae522be96b5f6a38e43c84aa3475f86c55c088a6149b03ec98c682b3cc4a
+DIST cmake-3.24.1-docs.tar.xz 491808 BLAKE2B 5bafdcb5b705581fbb63e9733d37ca10b8fa1803ea471afb723e26421989cb3b204952640438db11425e3bb536267bbb3e0bb6e618bee2cd4662517201aa1196 SHA512 8181dd4cbf066d42af620ee265cbd6eac0d2edf744706ec63909ac819458c1dd3f118129f54255e1f27a61af6a0ae4d72a2dc066ca5fd3e747962b9a8b3f9bee
+DIST cmake-3.24.1.tar.gz 10392868 BLAKE2B 628e2610c01af8e03eb7a201ae56a6e909c63314a993d2066f363d6181cfd2d0a0e5c09e9f74ad5ae3d226e15c2b04be250dc9bf1a273158fa3073bcc05c3a8e SHA512 67bfafcf9ceba617d7ebbb0ac88b689a2d90ab51fea4a83bd073ee082fb55de8962ce7fb283f3db5f455d286f2199843ffa595a1de207d4fa3e4472d951eb289
 EBUILD cmake-3.22.2.ebuild 7052 BLAKE2B b0c8b15546a0216be79e66918de373cf6eb45eb080fb2871aa543f7518f71876bc79df21e894cfdfbe921718bf30d2915c9242a03cbcc4f19b955a2f2b9d8d85 SHA512 d2627f09f761e83363ef1a0a960dc4660d71160a47329f141cca9c9d0404d784719b258123db1716aec885d091f55206cc85f732b4235f0d19bee4e4e5c28d33
 EBUILD cmake-3.22.4.ebuild 6819 BLAKE2B 80a67b691859734df593dc01add20acedfc991b0beba716690258fde46d9d3477a578bbe18eaae87744024093f1e9dc214cbc032e1a5c29ee980517ba668e00e SHA512 0b92fe74c7b0f62db3b107c9a1e5ae750e1f9fa013ae34e874564470a01148df750da7bcff0bfb465c094d547e926cb3bc27633837e23de24a07fba2a3bbb409
 EBUILD cmake-3.22.6.ebuild 6827 BLAKE2B c219b7191f3562325b33d75c3958cdf291ada8a892212e6b132ecd43fb77437465462dd4a6adc3958faff0b01a5ead7c0edf6011a0f232cc37d69045d8b6f60a SHA512 d3e5f98312456305149800f784362c37f69b1d50ff09088b474edd450046def404d6fedc02220674caf78bfc118fc5c710c9e85a98d5e13ef81801183fccba8d
@@ -31,5 +35,6 @@ EBUILD cmake-3.23.1.ebuild 7794 BLAKE2B e891b0a6ca8cf3335a46178040a6d28534277ad9
 EBUILD cmake-3.23.2.ebuild 7794 BLAKE2B e891b0a6ca8cf3335a46178040a6d28534277ad9c5ba830ce30d37e59afe92bc147e4bc2fac1a49b9674e7f3fc3bc936453a831a34ccb5e4546fb96ba63de857 SHA512 2fba10f3ba197d9ad36a503c7fad84916716399320b5bfeabf439cab06cfbe0640479a9bd85a5ab3ac341c5a53d74bfa7ef2ea967198073e0cd215e8fff93fc5
 EBUILD cmake-3.23.3.ebuild 7794 BLAKE2B e891b0a6ca8cf3335a46178040a6d28534277ad9c5ba830ce30d37e59afe92bc147e4bc2fac1a49b9674e7f3fc3bc936453a831a34ccb5e4546fb96ba63de857 SHA512 2fba10f3ba197d9ad36a503c7fad84916716399320b5bfeabf439cab06cfbe0640479a9bd85a5ab3ac341c5a53d74bfa7ef2ea967198073e0cd215e8fff93fc5
 EBUILD cmake-3.24.0.ebuild 8834 BLAKE2B 5abfce57dc418fe4cfeb30cc02db6da256f2750c255bc9a348e157473257b889f07b658bbade12c0fa3804ae9551d8ef0e90a605a39ab43928483433660476a5 SHA512 ffb1afb51a83b2d24b3cb4092ab43329a1bfe00ac3fafbf2e62713de7aa51d5e9eb5325e4edd0763ce041d18faddccf422f08edd4fadf2984d15fbacdca3791d
-EBUILD cmake-9999.ebuild 8834 BLAKE2B 5abfce57dc418fe4cfeb30cc02db6da256f2750c255bc9a348e157473257b889f07b658bbade12c0fa3804ae9551d8ef0e90a605a39ab43928483433660476a5 SHA512 ffb1afb51a83b2d24b3cb4092ab43329a1bfe00ac3fafbf2e62713de7aa51d5e9eb5325e4edd0763ce041d18faddccf422f08edd4fadf2984d15fbacdca3791d
+EBUILD cmake-3.24.1.ebuild 8817 BLAKE2B 06ac24772d2c04132c85a6b6823771eaf1c1b44d6bc77ac891a0b29725d57576e4c23ca54ee7ae54ff6cf20f403909b6f890fe469fca6d5a8a2e350524f8dec6 SHA512 c945fa714a256b0a3e6d8ea713b55ea0f914f37d6776428bb89fd30c0341711130c5bf795f8c8ec3e6c4c9c103be8e93737b86e6528b6d1efe301cb600d40a84
+EBUILD cmake-9999.ebuild 8817 BLAKE2B 06ac24772d2c04132c85a6b6823771eaf1c1b44d6bc77ac891a0b29725d57576e4c23ca54ee7ae54ff6cf20f403909b6f890fe469fca6d5a8a2e350524f8dec6 SHA512 c945fa714a256b0a3e6d8ea713b55ea0f914f37d6776428bb89fd30c0341711130c5bf795f8c8ec3e6c4c9c103be8e93737b86e6528b6d1efe301cb600d40a84
 MISC metadata.xml 456 BLAKE2B 2dc475cae4d2f65744e25381b1e4fe8b6399225380d0f9fa81870813221d180b1c4b538c3f9249f80e921a1db8afab7071db206898fdec294372811dc456d1f5 SHA512 347c1e13f459dfb9bec9d52ce556526eb74e6c432ff28aed28f05dc17bba17934fff1ce2fc27765b390bb55aaa7b02d0800939eb4382eba6c4b85a62ec136f5a
diff --git a/dev-util/cmake/cmake-3.24.1.ebuild b/dev-util/cmake/cmake-3.24.1.ebuild
new file mode 100644
index 000000000000..9491df325a39
--- /dev/null
+++ b/dev-util/cmake/cmake-3.24.1.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${CMAKE_DOCS_PREBUILT:=1}
+
+CMAKE_DOCS_PREBUILT_DEV=sam
+CMAKE_DOCS_VERSION=$(ver_cut 1-3)
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# See bug #784815
+CMAKE_DOCS_USEFLAG="+doc"
+
+# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
+# ... but seems fine as of 3.22.3?
+# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
+	toolchain-funcs virtualx xdg-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/"
+if [[ ${PV} == 9999 ]] ; then
+	CMAKE_DOCS_PREBUILT=0
+
+	EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git"
+	inherit git-r3
+else
+	SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+	if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
+		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )"
+	fi
+
+	if [[ ${PV} != *_rc* ]] ; then
+		VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc
+		inherit verify-sig
+
+		SRC_URI+=" verify-sig? (
+			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt
+			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
+		)"
+
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )"
+	fi
+fi
+
+[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="CMake"
+SLOT="0"
+IUSE="${CMAKE_DOCS_USEFLAG} emacs ncurses qt5 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-arch/libarchive-3.3.3:=
+	app-crypt/rhash
+	>=dev-libs/expat-2.0.1
+	>=dev-libs/jsoncpp-1.9.2-r2:0=
+	>=dev-libs/libuv-1.10.0:=
+	>=net-misc/curl-7.21.5[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	emacs? ( >=app-editors/emacs-23.1:* )
+	ncurses? ( sys-libs/ncurses:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND+="
+	doc? (
+		dev-python/requests
+		dev-python/sphinx
+	)
+	test? ( app-arch/libarchive[zstd] )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	# Prefix
+	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
+	"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
+
+	# Handle gentoo packaging in find modules
+	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
+	# Next patch needs to be reworked
+	#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+	# Respect python eclasses
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+
+	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
+
+	# upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+	# disable running of cmake in bootstrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' \
+			Source/kwsys/CMakeLists.txt || die
+	fi
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
+		|| die "Bootstrap failed"
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	elif ! use verify-sig || [[ ${PV} == *_rc* ]] ; then
+		default
+	else
+		cd "${DISTDIR}" || die
+
+		# See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature
+		verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc}
+		verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz
+
+		cd "${WORKDIR}" || die
+
+		default
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Disable Xcode hooks, bug #652134
+		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
+			Source/CMakeLists.txt || die
+		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
+			-e '/cmGlobalXCodeGenerator.h/d' \
+			Source/cmake.cxx || die
+
+		# Disable isysroot usage with GCC, we've properly instructed
+		# where things are via GCC configuration and ldwrapper
+		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
+			Modules/Platform/Apple-GNU-*.cmake || die
+		# Disable isysroot usage with clang as well
+		sed -i -e '/_SYSROOT_FLAG/d' \
+			Modules/Platform/Apple-Clang.cmake || die
+		# Don't set a POSIX standard, system headers don't like that, #757426
+		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmLoadCommandCommand.cxx \
+			Source/cmStandardLexer.h \
+			Source/cmSystemTools.cxx \
+			Source/cmTimestamp.cxx
+		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmStandardLexer.h
+	fi
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
+	if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then
+		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+		cmake_src_bootstrap
+	fi
+}
+
+src_configure() {
+	# Fix linking on Solaris
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
+	# ODR warnings, bug #858335
+	# https://gitlab.kitware.com/cmake/cmake/-/issues/20740
+	filter-lto
+
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		-DBUILD_CursesDialog="$(usex ncurses)"
+		-DBUILD_TESTING=$(usex test)
+	)
+	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+	# Fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null || die
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    BundleUtilities: bundle creation broken
+	#    CMakeOnly.AllFindModules: pthread issues
+	#    CTest.updatecvs: which fails to commit as root
+	#    Fortran: requires fortran
+	#    RunCMake.CompilerLauncher: also requires fortran
+	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+	#        debugedit binary is not in the expected location
+	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
+	#        it can't find a deb package that owns libc
+	#    TestUpload, which requires network access
+	#    RunCMake.CMP0125, known failure reported upstream (bug #829414)
+	local myctestargs=(
+		--output-on-failure
+		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \
+	)
+
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# If USE=doc, there'll be newly generated docs which we install instead.
+	if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
+		doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8]
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/vim/syntax/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/vim/indent/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/dev-util/cmake/cmake-9999.ebuild b/dev-util/cmake/cmake-9999.ebuild
index 3b075816e4cf..9491df325a39 100644
--- a/dev-util/cmake/cmake-9999.ebuild
+++ b/dev-util/cmake/cmake-9999.ebuild
@@ -6,7 +6,8 @@ EAPI=8
 # Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs
 # Set to 1 if prebuilt, 0 if not
 # (the construct below is to allow overriding from env for script)
-CMAKE_DOCS_PREBUILT=${CMAKE_DOCS_PREBUILT:-1}
+: ${CMAKE_DOCS_PREBUILT:=1}
+
 CMAKE_DOCS_PREBUILT_DEV=sam
 CMAKE_DOCS_VERSION=$(ver_cut 1-3)
 # Default to generating docs (inc. man pages) if no prebuilt; overridden later
diff --git a/dev-util/pkgdev/Manifest b/dev-util/pkgdev/Manifest
index 48649264fad2..2324b9fca694 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -3,6 +3,6 @@ DIST pkgdev-0.2.1-docs.tar.xz 4156 BLAKE2B d0cae24586dd24d03ae0378205ebf164957a1
 DIST pkgdev-0.2.1.tar.gz 66455 BLAKE2B 6f89b1601813adcb1263a044a096d187d7fa926f116a09dc2b1cec083f8d82da54ae00577c36d64ece5733d8952f8dc5f4dff94aeb695e851f340a30f04b203e SHA512 8277f74f3d9902da295c5436a46302627bdc1cb2a63f29b0603bf9bfa2c8bb812b26f12a54630cbbcba1e2bbac7352146f6ab59fc04cd8b89b46df1fe7c9f8dd
 EBUILD pkgdev-0.2.1-r1.ebuild 1655 BLAKE2B edf95d40cb96f7abc2853578c87ff3e8edfeee86844e2ab942d83d55171706806f64f19cb829458f9a312d73d6e385930ab7f439a363f314ae01684e0bee63c5 SHA512 576098e57216e1639827d25aad586465a9c5fde7391e4c0521474c9e1923371903d30de1b835b5d21fd822c5ef3d6a579f2ff0935d6437e998f095d709f7c225
 EBUILD pkgdev-0.2.1-r2.ebuild 2465 BLAKE2B b7f60fab59f33834b318a515f42a2adcb2b46421131173bfe7833d59e12fcdf925c6f3e4944148f2038904792bfd3a8b05ef128648a5c5bee450d87488f7fb49 SHA512 a657125972cac4f278d21fc484096afb2fadffe73810e1ca66d643d3ea71c8343ccf58ced54c8dd814fd7f5027330e149f3c1a10057b8e5b5523fa6fcd35f181
-EBUILD pkgdev-0.2.1-r3.ebuild 2467 BLAKE2B fb3f3cff23493f905db0d04b2a75debe3c56ee90e97b8c720a1b484280fbcb66845605c72e1ea857e6a37a2da4a7aa4a6d013ec23ab569cbcc8e3f139e7bb751 SHA512 b2e314aa8de2ca3c231a1333f346377507051383acd930b0dfd6de8fb10bf26dd976bc230f1d6f386abf24407a1e4656ac601bf514540430e96516eeb2e47455
-EBUILD pkgdev-9999.ebuild 2408 BLAKE2B 092e676a634b3e2760c68527356513b399d5a442c7c5ddf545a4f55960454601c831c8c06a90d07319a9750ac56c927de77475ccc9e0bd060edae56e0215d31c SHA512 10e34df32e0349b56f4539ca286fd1ebddec13ac9013314e10aa23f05c51b9bd6a6f939d9a311683407bbd1952dde6feae52242b67e94d2ca471f810ed5c6910
+EBUILD pkgdev-0.2.1-r3.ebuild 2449 BLAKE2B 9d192516dfe71e733ede5dd18e44af663a99e30f7d642e906efca2972393557b9e0bdb8422d10416585026d0ada388ef2adbed98c7112e3edbf96204ee39401f SHA512 5073e5a7a1a8b6982afc448317e71beb5125e4a2393552061b5e2fee0de0c27a255bea635a696b0cbe780efa6c2cf7bdb723d764edd244cf758f0d2d0639e513
+EBUILD pkgdev-9999.ebuild 2390 BLAKE2B 7d399dcbaac13e26592fa8c3323f03779f7386513dc3616d5aecfc8d7ed9a0d725914c12d10c2cef424be24dc360cc0f9fa5c3cfd7105d4446b1d07e7254fd82 SHA512 9c48745f935db02383a622814381ef78444ad4585150b5531195144e1408a5ab580d657829e3c814fcfaac9293a9f307985e251ec0590988854f65cdb2354777
 MISC metadata.xml 606 BLAKE2B 9c87b0b058df2a15ad455e54499d6a52e31e5c8f51187d36a42a775f1fa03745c69c99179a21f8c44f64562f78ddade051a2a4568b7984600fc529f35e36811a SHA512 5c7151cd72132faf4d47837a58812aefb919edca3fb613a6751de265994bff327515a07d80dfe175069bde7097581f10cb453dde1545383e300735dfcac09bec
diff --git a/dev-util/pkgdev/pkgdev-0.2.1-r3.ebuild b/dev-util/pkgdev/pkgdev-0.2.1-r3.ebuild
index 5758209ab661..080ce3e061e9 100644
--- a/dev-util/pkgdev/pkgdev-0.2.1-r3.ebuild
+++ b/dev-util/pkgdev/pkgdev-0.2.1-r3.ebuild
@@ -6,7 +6,8 @@ EAPI=8
 # Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-pkgdev-docs
 # Set to 1 if prebuilt, 0 if not
 # (the construct below is to allow overriding from env for script)
-PKGDEV_DOCS_PREBUILT=${PKGDEV_DOCS_PREBUILT:-1}
+: ${PKGDEV_DOCS_PREBUILT:=1}
+
 PKGDEV_DOCS_PREBUILT_DEV=sam
 PKGDEV_DOCS_VERSION=$(ver_cut 1-3)
 # Default to generating docs (inc. man pages) if no prebuilt; overridden later
diff --git a/dev-util/pkgdev/pkgdev-9999.ebuild b/dev-util/pkgdev/pkgdev-9999.ebuild
index 4d8a1fd72641..5172a308d581 100644
--- a/dev-util/pkgdev/pkgdev-9999.ebuild
+++ b/dev-util/pkgdev/pkgdev-9999.ebuild
@@ -6,7 +6,8 @@ EAPI=8
 # Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-pkgdev-docs
 # Set to 1 if prebuilt, 0 if not
 # (the construct below is to allow overriding from env for script)
-PKGDEV_DOCS_PREBUILT=${PKGDEV_DOCS_PREBUILT:-1}
+: ${PKGDEV_DOCS_PREBUILT:=1}
+
 PKGDEV_DOCS_PREBUILT_DEV=sam
 PKGDEV_DOCS_VERSION=$(ver_cut 1-3)
 # Default to generating docs (inc. man pages) if no prebuilt; overridden later
diff --git a/dev-util/wayland-scanner/Manifest b/dev-util/wayland-scanner/Manifest
index 65b6a2537b2d..30fe826f049a 100644
--- a/dev-util/wayland-scanner/Manifest
+++ b/dev-util/wayland-scanner/Manifest
@@ -1,6 +1,4 @@
-DIST wayland-1.20.0.tar.xz 225188 BLAKE2B d607610ad8b30b6b3bbfc3945679f698030f271766cfb72425f98f170a96469fb085fb9a746a866b8562d7f452c844e61ad57f634dcf365474c7d050b76022e9 SHA512 e8a1f410994b947f850799bdd0d95a2429d8467f853e62a0ab3915a4e9fe130f8aa977e03715114ab740c6ec546edea63d275ce7f927d4f3029ea126e6a7d215
 DIST wayland-1.21.0.tar.xz 225936 BLAKE2B 2b43eb1517d476bb2b4daed1083373655b57d047968fdb93dbbbbe4235af12e25557627e30b5c3d2575bac4beaf1e0a0b8ef10a3c673538d9097501f33c05836 SHA512 5575216d30fdf5c63caa6bcad071e15f2a4f3acb12df776806073f65db37a50b5b5b3cc7957c5497636f4ac01893e2eaab26e453ded44b287acde01762f5fdc3
-EBUILD wayland-scanner-1.20.0.ebuild 992 BLAKE2B 47a95fe8fa62d143e48f397e255fcb5ba868c86a8253e58b354b453994718f7c362df9e2858d58ca3772309aa5f101e66508e622806090c84fe370469129d231 SHA512 316c93ac9e9f64e8a38639c905aa6ba622a0730d1e517734e748946750407651808cf4e9636fb0b58910c6fbbd3c2f18dd94cec656322e1582fdb8b8ce361502
 EBUILD wayland-scanner-1.21.0.ebuild 1023 BLAKE2B f9dc1119418dd9e0c9b9b75386eb92b9c04d042e272cf51396b8518195d3a0393e73a1cadf920bd670c59409c6812501beec53c66f5e742aab31fa555b7b4b38 SHA512 53e6eb2afb669fd64310446a2233d1cdc5587319ac915a8c3d0d06923261a5231bce8290f70921fc3d7caa47b5a5027a00726c7e643044e9855c65bd0a3fbe37
 EBUILD wayland-scanner-9999.ebuild 1030 BLAKE2B 69772afc5b2457fb4c2a3aa983a1b84776b94a03b220bc5d37dd76791188fb210d94c5299933737aa9e8d27c3cf7ef679c99bbff2f1daa7e9300241e9ca35041 SHA512 3e38ef866c22d8e8c4d125489577e4a72ef6e658b849714d7e79ef0c6092a86d66a6fda20b0043e83e52b30c96fbfd3eef6bb32a27918357d44f77c9ebda2349
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/dev-util/wayland-scanner/wayland-scanner-1.20.0.ebuild b/dev-util/wayland-scanner/wayland-scanner-1.20.0.ebuild
deleted file mode 100644
index fd49b06b6e6c..000000000000
--- a/dev-util/wayland-scanner/wayland-scanner-1.20.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git"
-	inherit git-r3
-else
-	SRC_URI="https://wayland.freedesktop.org/releases/wayland-${PV}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-	S="${WORKDIR}/wayland-${PV}"
-fi
-inherit meson
-
-DESCRIPTION="wayland-scanner tool"
-HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
-
-LICENSE="MIT"
-SLOT="0"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	!<dev-libs/wayland-${PV}
-	>=dev-libs/expat-2.1.0-r3:=
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local emesonargs=(
-		-Ddocumentation=false
-		-Ddtd_validation=false
-		-Dlibraries=false
-		-Dscanner=true
-		-Dtests=false
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	mv "${ED}"/usr/$(get_libdir)/pkgconfig "${ED}"/usr/share/pkgconfig
-}
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index b776ce18d1ea..126cadcb3c7f 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/display-manager-init/Manifest b/gui-libs/display-manager-init/Manifest
index d8e15bd02b5d..0389c689d130 100644
--- a/gui-libs/display-manager-init/Manifest
+++ b/gui-libs/display-manager-init/Manifest
@@ -1,9 +1,7 @@
 AUX display-manager-setup.initd 224 BLAKE2B 8513295b8c315d71521ac24fc9da1878e32044ebe7b6e37afb77a25eb8ec449568a82e516fd04de7fb2b0f0b5ff355a54a257041616d0035b25d0ae191e336e4 SHA512 d0048fc5b3c0fd92a44b71f7b8132e35787e42095c22f53aa41c10505c219eb25015f76163069aab7ebb6f0ac9feeac62d1b74682fd3947e835ea5de36957727
 AUX display-manager.confd 608 BLAKE2B 814b4d36ce74d2f70a771cda31c3b9f6e21246bef681607d2687b3ed51f1baab8752fe94ad1021b9fd81b3e8444a328d2c1de83718534ea722ef9dadcbdca164 SHA512 40fb28fb6ac06b59fed9fec86816a444f53ea499bb9a7e7a072a5a932b45a29f830b9da9de0954b1f5cb21903c08ff5c997db2e32ee0bb1a300cd6c070cc8aa6
-AUX display-manager.initd-r1 6201 BLAKE2B d30dd3c2cfc651c48e4f5a25ddae401894c994286fd5dd5c3668de92e107fdd36a7c14d47f0c080854004aaf6f9cfe7e0a41abee552a69077ed4c795ce834623 SHA512 fdef2ff2eedda6c0b262f5f1fa4b0f3c9bea56b575956b308c2fd145eba204c3cf9f336b6348cc12dd342bcbb64ed2e49f3f82c143249d74c922ac472b786851
 AUX display-manager.initd-r2 6237 BLAKE2B a0bf7c7563419f14867568c111a7d3456eadf5037a0d993ed92bc2270fed6f920e1a23602f2de0d287e05844d1a0d52dfc663da9a4bfcdfd3d54615cc8282dca SHA512 084eb98fe656fdfdf669345738009b722dec8cc3eddea5d4df184a70985152e19925b4e4c00d695e5ae29cc8f93aee9d3ac353483df7f3bda25d4fbb1ceea50e
 AUX startDM-r1 778 BLAKE2B 134345da401d5d75cb4e3cf79189a2594e508d4afe748bc209e8a93ea754169b205b114fcdb830ed95908788d0bf9cf071cd50de0c37df7fe5b83827f406d766 SHA512 e0cbb1f0ca6d6d3ae3f963bb5508e5b58e03682aba3f35cb2c1819c17e2d94ee240a5dc603f9fd93d22ecca060d131e46c0a0a25685aa8deac280294ff76b8c9
 AUX xdm.initd 200 BLAKE2B ec997b7080037a7197a6f75728d9075c846168115d705015afc6518e1e72d815cdf87c2e9e3f3ad950034599e548d015e530cb7821f83b9d289337908455c17a SHA512 4552215cc2cdffa3298a9136e2a22f600f55958d7f74b2d06bbf48568d8034ef24deea27ad9f8d6d100516b0efb4e2688c1f454dc556120f759b1da7fecd877c
-EBUILD display-manager-init-1.0-r3.ebuild 1678 BLAKE2B 7f273bc6a60add881ca14152682cc73397034a6d704a02ad91512746a5765b8910137a157fe650ef8cd2a9925fceee8bc60d7278a316853b87a3eaa611f19432 SHA512 3a1d038ce0a6788ebb21fdd76d8fe0f8a24cede8595d54b0030254a0e7ffae90966185840981626e31ae68322096d36f56c5e6011fc15f95da19d28a9a38e5ee
 EBUILD display-manager-init-1.0-r4.ebuild 1678 BLAKE2B 6f660ee635bf419c54e8a72efc4f5a8a8a3044cdfdf71a94d3a170408f5e9587a68d5ca0744e8f880144c18ba20b2af70086732d9b1cdbf0fb3c3351554e21b8 SHA512 c7ecf09d9a875ed9216a9e2b343f996610d20427d4c9f5e427784a6700f8473c720c4051011ad99e5c4ea95177ead20ac0fe251adbfbdbe73e400759f066cb2a
 MISC metadata.xml 259 BLAKE2B cc7abf54ed4398a2cfb77310c63f5fae3e432488b0c7466f8148c5d009d38aa4ca78eef78712f0b7b6aca6710aab1dfe3c07440f36179fde03f8a97a49b3c080 SHA512 6f50c5d3c735db431156906312a7c1dab3723d8c9e51d15148b92d97a998221c6838eb926f36c6b924c9fc8a6a64ba904e36482ff5164867c482502aa638462f
diff --git a/gui-libs/display-manager-init/display-manager-init-1.0-r3.ebuild b/gui-libs/display-manager-init/display-manager-init-1.0-r3.ebuild
deleted file mode 100644
index f7ac8e8f201e..000000000000
--- a/gui-libs/display-manager-init/display-manager-init-1.0-r3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="RC init files for starting display and login managers"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:X11"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-S="${WORKDIR}"
-
-RDEPEND="
-	sys-apps/gentoo-functions
-	!<=sys-apps/sysvinit-2.98
-	!<=x11-apps/xinit-1.4.1
-	!<=x11-base/xorg-server-1.20.10
-	!=x11-base/xorg-server-1.20.10-r2
-"
-
-src_install() {
-	newinitd "${FILESDIR}"/display-manager-setup.initd display-manager-setup
-	newinitd "${FILESDIR}"/display-manager.initd-r1 display-manager
-	newinitd "${FILESDIR}"/xdm.initd xdm
-	newconfd "${FILESDIR}"/display-manager.confd display-manager
-	newbin "${FILESDIR}"/startDM-r1 startDM
-	# backwards compatibility
-	dosym "${ESYSROOT}"/usr/bin/startDM /etc/X11/startDM.sh
-}
-
-pkg_preinst() {
-	if [[ ${REPLACING_VERSIONS} == "" && -f "${EROOT}"/etc/conf.d/xdm && ! -f "${EROOT}"/etc/conf.d/display-manager ]]; then
-		cp -a "${EROOT}"/etc/conf.d/{xdm,display-manager} || die
-	fi
-	local rlevel using_xdm
-	using_xdm=no
-	for rlevel in boot default sysinit; do
-		if [[ -e "${EROOT}"/etc/runlevels/${rlevel}/xdm ]]; then
-			using_xdm=yes
-		fi
-	done
-	if [[ "${using_xdm}" = "yes" ]]; then
-		ewarn "The 'xdm' service has been replaced by new 'display-manager'"
-		ewarn "service, please switch now:"
-		ewarn
-		ewarn "  # rc-update del xdm default"
-		ewarn "  # rc-update add display-manager default"
-		ewarn
-		ewarn "Remember to run etc-update or dispatch-conf to update the"
-		ewarn "config protected service files."
-	fi
-}
diff --git a/gui-libs/display-manager-init/files/display-manager.initd-r1 b/gui-libs/display-manager-init/files/display-manager.initd-r1
deleted file mode 100644
index 9402e969f4a5..000000000000
--- a/gui-libs/display-manager-init/files/display-manager.initd-r1
+++ /dev/null
@@ -1,236 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License, v2
-
-# This is here to serve as a note to myself, and future developers.
-#
-# Any Display manager (gdm,kdm,xdm) has the following problem:  if
-# it is started before any getty, and no vt is specified, it will
-# usually run on vt2.  When the getty on vt2 then starts, and the
-# DM is already started, the getty will take control of the keyboard,
-# leaving us with a "dead" keyboard.
-#
-# Resolution: add the following line to /etc/inittab
-#
-#  x:a:once:/usr/bin/startDM
-#
-# and have /usr/bin/startDM start the DM in daemon mode if
-# a lock is present (with the info of what DM should be started),
-# else just fall through.
-#
-# How this basically works, is the "a" runlevel is a additional
-# runlevel that you can use to fork processes with init, but the
-# runlevel never gets changed to this runlevel. Along with the "a"
-# runlevel, the "once" key word means that startDM will only be
-# run when we specify it to run, thus eliminating respawning
-# startDM when "display-manager" is not added to the default 
-# runlevel, as was done previously.
-#
-# This script then just calls "telinit a", and init will run
-# /usr/bin/startDM after the current runlevel completes (this
-# script should only be added to the actual runlevel the user is
-# using).
-#
-# Martin Schlemmer
-# aka Azarah
-# 04 March 2002
-
-depend() {
-	need localmount display-manager-setup
-
-	# this should start as early as possible
-	# we can't do 'before *' as that breaks it
-	# (#139824) Start after ypbind and autofs for network authentication
-	# (#145219 #180163) Could use lirc mouse as input device
-	# (#70689 comment #92) Start after consolefont to avoid display corruption
-	# (#291269) Start after quota, since some dm need readable home
-	# (#390609) gdm-3 will fail when dbus is not running
-	# (#366753) starting keymaps after X causes problems
-	# (#768834) race condition with elogind
-	after bootmisc consolefont modules netmount
-	after readahead-list ypbind autofs openvpn gpm lircmd
-	after quota keymaps
-	after elogind
-	before alsasound
-
-	# Start before GUI
-	use dbus xfs
-}
-
-setup_dm() {
-	local MY_XDM
-
-	MY_XDM=$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]')
-
-	NAME=
-	case "${MY_XDM}" in
-		kdm|kde)
-			# Load our root path from profile.env
-			# Needed for kdm
-			PATH=${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}")
-			EXE=/usr/bin/kdm
-			PIDFILE=/run/kdm.pid
-			;;
-		entrance*)
-			EXE=/usr/sbin/entrance
-			PIDFILE=/run/entrance.pid
-			;;
-		gdm|gnome)
-			# gdm-3 and above has different paths
-			if [ -f /usr/sbin/gdm ]; then
-				EXE=/usr/sbin/gdm
-				PIDFILE=/run/gdm/gdm.pid
-				START_STOP_ARGS="--background"
-				AUTOCLEAN_CGROUP="yes"
-			else
-				EXE=/usr/bin/gdm
-				PIDFILE=/run/gdm.pid
-			fi
-			[ "${RC_UNAME}" != "Linux" ] && NAME=gdm-binary
-			;;
-		greetd)
-			EXE=/usr/bin/greetd
-			PIDFILE=/run/greetd.pid
-			START_STOP_ARGS="-m --background"
-			;;
-		wdm)
-			EXE=/usr/bin/wdm
-			PIDFILE=
-			;;
-		gpe)
-			EXE=/usr/bin/gpe-dm
-			PIDFILE=/run/gpe-dm.pid
-			;;
-		lxdm)
-			EXE=/usr/sbin/lxdm-binary
-			PIDFILE=/run/lxdm.pid
-			START_STOP_ARGS="--background"
-			;;
-		lightdm)
-			EXE=/usr/sbin/lightdm
-			PIDFILE=/run/lightdm.pid
-			START_STOP_ARGS="--background"
-			;;
-		sddm)
-			EXE="/usr/bin/sddm"
-			START_STOP_ARGS="-m --background"
-			PIDFILE=/run/sddm.pid
-			;;
-		*)
-			# first find out if there is such executable
-			EXE="$(command -v ${MY_XDM} 2>/dev/null)"
-			PIDFILE="/run/${MY_XDM}.pid"
-
-			# warn user that they are doing sick things if the exe was not found
-			if [ -z "${EXE}" ]; then
-				echo "ERROR: Your XDM value is invalid."
-				echo "  No ${MY_XDM} executable could be found on your system."
-			fi
-			;;
-	esac
-
-	if ! [ -x "${EXE}" ]; then
-		EXE=/usr/bin/xdm
-		PIDFILE=/run/xdm.pid
-		if ! [ -x "/usr/bin/xdm" ]; then
-			echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm,"
-			echo "	or install x11-apps/xdm package"
-			eend 255
-		fi
-	fi
-}
-
-# Check to see if something is defined on our VT
-vtstatic() {
-	if [ -e /etc/inittab ] ; then
-		grep -Eq "^[^#]+.*\<tty$1\>" /etc/inittab
-	elif [ -e /etc/ttys ] ; then
-		grep -q "^ttyv$(($1 - 1))" /etc/ttys
-	else
-		return 1
-	fi
-}
-
-start() {
-	local EXE NAME PIDFILE AUTOCLEAN_CGROUP
-	setup_dm
-
-	if [ -f /run/.nogui ]; then
-		einfo "Skipping ${EXE##*/}, /run/.nogui found or 'nogui' bootparam passed."
-		rm /run/.nogui
-		return 0
-	fi
-
-	ebegin "Setting up ${EXE##*/}"
-
-	# save the prefered DM
-	save_options "service" "${EXE}"
-	save_options "name"    "${NAME}"
-	save_options "pidfile" "${PIDFILE}"
-	save_options "start_stop_args" "${START_STOP_ARGS}"
-	save_options "autoclean_cgroup" "${AUTOCLEAN_CGROUP:-no}"
-
-	if [ -n "${CHECKVT-y}" ] ; then
-		if vtstatic "${CHECKVT:-7}" ; then
-			if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ] && [ "${RC_SOFTLEVEL}" != "BOOT" ]; then
-				ewarn "Something is already defined on VT ${CHECKVT:-7}, will start X later"
-				telinit a >/dev/null 2>&1
-				return 0
-			else
-				eerror "Something is already defined on VT ${CHECKVT:-7}, not starting"
-				return 1
-			fi
-		fi
-	fi
-
-	/usr/bin/startDM
-	eend 0
-}
-
-stop() {
-	local curvt retval
-
-	retval=0
-	if [ -t 0 ]; then
-		if type fgconsole >/dev/null 2>&1; then
-			curvt=$(fgconsole 2>/dev/null)
-		else
-			curvt=$(tty)
-			case "${curvt}" in
-				/dev/ttyv[0-9]*) curvt=${curvt#/dev/ttyv} ;;
-				*) curvt= ;;
-			esac
-		fi
-	fi
-	local myexe myname mypidfile myservice
-	myexe=$(get_options "service")
-	myname=$(get_options "name")
-	mypidfile=$(get_options "pidfile")
-	myservice=${myexe##*/}
-	yesno "${rc_cgroup_cleanup:-no}" || rc_cgroup_cleanup=$(get_options "autoclean_cgroup")
-
-	[ -z "${myexe}" ] && return 0
-
-	ebegin "Stopping ${myservice}"
-
-	if start-stop-daemon --quiet --test --stop --exec "${myexe}" 2>/dev/null; then
-		start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \
-			"${mypidfile:+--pidfile}" "${mypidfile}" \
-			"${myname:+--name}" "${myname}"
-		retval=${?}
-	fi
-
-	# switch back to original vt
-	if [ -n "${curvt}" ]; then
-		if type chvt >/dev/null 2>&1; then
-			chvt "${curvt}"
-		else
-			vidcontrol -s "$((curvt + 1))"
-		fi
-	fi
-
-	eend ${retval} "Error stopping ${myservice}"
-	return ${retval}
-}
-
-# vim: set ts=4 :
diff --git a/gui-libs/gtk/Manifest b/gui-libs/gtk/Manifest
index a78c62a2b87a..99dc2c47991c 100644
--- a/gui-libs/gtk/Manifest
+++ b/gui-libs/gtk/Manifest
@@ -1,3 +1,5 @@
 DIST gtk-4.6.6.tar.xz 23085304 BLAKE2B 2f0eacb9aaa3fad4e8d99feeadc93e04151f6c4552412d5b7485b972e97c8c9a7296143b39791e9e3230546770174a208ba6906179b9fed37414ee83a1980abb SHA512 b743d99029d7d51db19396641023eefd5d25bbacbd89ad6660d43e382b26fe6cc5e9ce8f0dbb3f4ac7d2143db617ea0c2e2d3cc8926fc93d735eb76ffb2f8309
+DIST gtk-4.6.7.tar.xz 22885556 BLAKE2B ff3647fbb87fb7743c6aaf84f4de463275ff5816ccdba7f29425ee5268677e53ef56507ddd71447def5a1707e7509958068d5b8a7c64816cc3a1541691d7a262 SHA512 7f9068f66b472e796c1611625a34466b13aa51bce2dfc7661928e6d8087ed39ed0f6adf47a6691609b85540c588621bebc5951e81435277071abe7d2facf28bb
 EBUILD gtk-4.6.6.ebuild 5745 BLAKE2B c090fbea68e8d23d71acbffa6edb1aeeb8e608b590bdd91b4cc62cfe87dc2d1cf9188b32f40ced56dab76720f405cd72b96a9122025b139baf31d30b410d378a SHA512 8882fa618521b5142904b8cee86eab996f3ab11cefa3727e9b3e58b409cbe9968a644f64790233f8629b8dcc0ba63e645c9b480e929921c5c2440cef2d8e3238
+EBUILD gtk-4.6.7.ebuild 5751 BLAKE2B 86ced14f38da4d73952ba9696731fbb320ca0aeb982f10d94d59431c45e7f085a4f8b42eeb86ebb8a92b054e9692168ce10daf0cf95d3f079f1962325186fa21 SHA512 4c57a850a9aafe4a8f48c88d7a97d0652fbdbbda2cab4689fe6f5665526f54067c1212aeb9261c2f471a26490b602ee396ff6d7ce376021d3bc0c3b676da1fb6
 MISC metadata.xml 690 BLAKE2B 4ae68aa63a0aea931c3584ac288ac62226bc1a78395dad3e7401f1988d4ab45d3895eb8149f1c06a849e1e27926097d8aa09dd5a33a2bf8b4ce52e4e1694b1e0 SHA512 ff6bd9799fe0f9e3e922744ed78cc9db278801e6e2d309fbf146535b061670f5f9162946ddf76cdf3d0e4defca16657ba39b3af81e5bcf2423385c74fc299779
diff --git a/gui-libs/gtk/gtk-4.6.7.ebuild b/gui-libs/gtk/gtk-4.6.7.ebuild
new file mode 100644
index 000000000000..5901072e16fc
--- /dev/null
+++ b/gui-libs/gtk/gtk-4.6.7.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit gnome.org gnome2-utils meson optfeature python-any-r1 virtualx xdg
+
+DESCRIPTION="GTK is a multi-platform toolkit for creating graphical user interfaces"
+HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/"
+
+LICENSE="LGPL-2+"
+SLOT="4"
+IUSE="aqua broadway colord cups examples ffmpeg gstreamer +introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	test? ( introspection )
+"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/fribidi-0.19.7
+	>=dev-libs/glib-2.66.0:2
+	>=media-libs/graphene-1.9.1[introspection?]
+	>=media-libs/libepoxy-1.4[egl,X(+)?]
+	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?]
+	>=x11-libs/gdk-pixbuf-2.30:2[introspection?]
+	>=x11-libs/pango-1.50.0[introspection?]
+	media-libs/libpng:0=
+	media-libs/tiff:0=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/harfbuzz-2.1.0:=
+	x11-misc/shared-mime-info
+
+	colord? ( >=x11-misc/colord-0.1.9:0= )
+	cups? ( >=net-print/cups-2.0 )
+	ffmpeg? ( media-video/ffmpeg )
+	gstreamer? (
+		>=media-libs/gst-plugins-bad-1.12.3
+		>=media-libs/gst-plugins-base-1.12.3[opengl]
+	)
+	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
+	vulkan? ( media-libs/vulkan-loader:= )
+	wayland? (
+		>=dev-libs/wayland-1.20.0
+		>=dev-libs/wayland-protocols-1.23
+		media-libs/mesa[wayland]
+		>=x11-libs/libxkbcommon-0.2
+	)
+	X? (
+		>=app-accessibility/at-spi2-atk-2.5.3
+		media-libs/fontconfig
+		media-libs/mesa[X(+)]
+		x11-libs/libX11
+		>=x11-libs/libXi-1.8
+		x11-libs/libXext
+		>=x11-libs/libXrandr-1.5
+		x11-libs/libXcursor
+		x11-libs/libXfixes
+		x11-libs/libXdamage
+		x11-libs/libXinerama
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
+	X? ( x11-base/xorg-proto )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-update-icon-cache-3
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="
+	gnome-base/librsvg
+	>=x11-themes/adwaita-icon-theme-3.14
+"
+BDEPEND="
+	dev-libs/gobject-introspection-common
+	introspection? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+		')
+	)
+	dev-python/docutils
+	>=dev-util/gdbus-codegen-2.48
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+	test? (
+		dev-libs/glib:2
+		wayland? ( dev-libs/weston[headless] )
+	)
+"
+
+python_check_deps() {
+	python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+}
+
+pkg_setup() {
+	use introspection && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	xdg_environment_reset
+
+	# dev-python/docutils installs rst2man.py, not rst2man
+	sed -i -e "s/'rst2man'/'rst2man.py'/" docs/reference/gtk/meson.build || die
+	# Nothing should use gtk4-update-icon-cache and an unversioned one is shipped by dev-util/gtk-update-icon-cache
+	sed -i -e '/gtk4-update-icon-cache/d' tools/meson.build || die
+	# Workaround RWX ELF sections, https://gitlab.gnome.org/GNOME/gtk/-/issues/4598
+	sed -i -e 's/^ld =.*/ld = disabler()/g' gtk/meson.build demos/gtk-demo/meson.build demos/widget-factory/meson.build || die
+	sed -i -e 's/^objcopy =.*/objcopy = disabler()/g' gtk/meson.build demos/gtk-demo/meson.build demos/widget-factory/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		# GDK backends
+		$(meson_use X x11-backend)
+		$(meson_use wayland wayland-backend)
+		$(meson_use broadway broadway-backend)
+		-Dwin32-backend=false
+		$(meson_use aqua macos-backend)
+
+		# Media backends
+		$(meson_feature ffmpeg media-ffmpeg)
+		$(meson_feature gstreamer media-gstreamer)
+
+		# Print backends
+		$(meson_feature cups print-cups)
+
+		# Optional dependencies
+		$(meson_feature vulkan)
+		-Dcloudproviders=disabled  # cloudprovider is not packaged in Gentoo yet
+		$(meson_feature sysprof)
+		-Dtracker=disabled  # tracker3 is not packaged in Gentoo yet
+		$(meson_feature colord)
+		# Expected to fail with GCC < 11
+		# See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71993
+		$(meson_feature cpu_flags_x86_f16c f16c)
+
+		# Documentation and introspection
+		-Dgtk_doc=false # we ship pregenerated API docs from tarball
+		-Dman-pages=true
+		$(meson_feature introspection)
+
+		# Demos and binaries
+		$(meson_use examples build-examples)
+		$(meson_use examples demos)
+		$(meson_use test build-tests)
+		-Dinstall-tests=false
+	)
+	meson_src_configure
+}
+
+src_test() {
+	"${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+
+	if use X; then
+		einfo "Running tests under X"
+		GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx meson_src_test --setup=x11
+	fi
+
+	if use wayland; then
+		einfo "Running tests under Weston"
+
+		export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
+
+		weston --backend=headless-backend.so --socket=wayland-5 --idle-time=0 &
+		compositor=$!
+		export WAYLAND_DISPLAY=wayland-5
+
+		GSETTINGS_SCHEMA_DIR="${S}/gtk" meson_src_test --setup=wayland
+
+		exit_code=$?
+		kill ${compositor}
+	fi
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /usr/share/gtk-doc/html
+	# This will install API docs specific to X11 and wayland regardless of USE flags, but this is intentional
+	doins -r "${S}"/docs/reference/{gtk/gtk4,gsk/gsk4,gdk/gdk4{,-wayland,-x11}}
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if ! has_version "app-text/evince"; then
+		elog "Please install app-text/evince for print preview functionality."
+		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+		elog "add it to your settings.ini file."
+	fi
+
+	if use examples ; then
+		optfeature "syntax highlighting in gtk4-demo" app-text/highlight
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 5cfab56a6a85..df3dd14a66db 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/encodings/Manifest b/media-fonts/encodings/Manifest
index 80d7bcaee8e0..0febf846852f 100644
--- a/media-fonts/encodings/Manifest
+++ b/media-fonts/encodings/Manifest
@@ -1,5 +1,3 @@
-DIST encodings-1.0.5.tar.bz2 713817 BLAKE2B 43e466c27fdf485e9704debb89c69a3c3eaecf84453362d86b53aa9c33d10b8f97f348ef35f8b430be101e8281ecce5d5f49a052929fc7cd37d94a7590645193 SHA512 920e49f0b3545f181a1574ca3280ac9adef1e68fe27566c195dd7013f728d355c0d759132789357fcf8fa7391fcbe1e17edf2bd85aa5611df5a4d99740011008
 DIST encodings-1.0.6.tar.xz 312720 BLAKE2B 4649d8d12fcfcbb7de9e8bd8aa7e77514835a56990123549137b4bbe5615c1e9fcddccb13b6442d8a525efd147926801a5029cb10126462b29e31e3354da3683 SHA512 2d52486996939401121bc858ba23031f70eef857760db8da4c84f083e981868e4bc7a8c2ab6d59274a0cf95f592a0dbfad47bce6c9299bb45d115b48abc39134
-EBUILD encodings-1.0.5-r1.ebuild 663 BLAKE2B d62b20760ba7f5db43696a531a08bad66f4f075f33dc64018425d04a0c522f949270066fc838e26b741e0fb1b24510fc03a721a3b5d13a92f509f776f93452e8 SHA512 4ef30bbe181a8c9e9c7d4782c9316e4d817691c2a5a8ade2906431616e8cd4fee81acd0dac104e912e09929f386dbe12cff1b0fcb9f7eff3e43fda5f7505fce2
 EBUILD encodings-1.0.6.ebuild 688 BLAKE2B 3fd065aa633c63beec5ca01550c3d93e28345fa9c4463a2a2df58c4cc806d8ffa3a81533fff9481f48bc00d12f2cc016023df033d3ec3cc670a7fb8fd7f31058 SHA512 dcd38396dda51aa217c1013ed322060125f09a472282d17e1b683af9139d315a4061bfacadef6212bcdee258e56e0f40e3c5512e7b100045f08b4efbbdcc44c4
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/encodings/encodings-1.0.5-r1.ebuild b/media-fonts/encodings/encodings-1.0.5-r1.ebuild
deleted file mode 100644
index 618a67ad1710..000000000000
--- a/media-fonts/encodings/encodings-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# font eclass is inherited directly, since this package is a special case that
-# would greatly complicate the fonts logic of xorg-3
-inherit font xorg-3
-
-DESCRIPTION="X.Org font encodings"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="x11-apps/mkfontscale
-	>=media-fonts/font-util-1.1.1-r1"
-
-XORG_CONFIGURE_OPTIONS=(
-	# https://bugs.gentoo.org/815520
-	--with-fontrootdir="${EPREFIX}"/usr/share/fonts
-)
diff --git a/media-fonts/fira-code/Manifest b/media-fonts/fira-code/Manifest
index 269cf767ae9c..fc015a19be8c 100644
--- a/media-fonts/fira-code/Manifest
+++ b/media-fonts/fira-code/Manifest
@@ -1,12 +1,3 @@
-DIST FiraCode-Regular-Symbol.zip 9337 BLAKE2B b901cc37ad796f3a68d8b9e492aa35570c2d718fc84920b5b23c0a055e46c19916a7ec6b2c0a0adba650161c5a032761d46b303de64bddd81696adf960e3e541 SHA512 2570958b0f4b28ded52327150b67118d693d6bc6f483be3e3147ddda1c5870ab21f1b64938e4abc1030080455976c0d33ae3925b51660fd2c8b5428b5b0f8eb7
-DIST Fira_Code_v6.1.zip 2463942 BLAKE2B 7a42ee426fbc64141a4e85271e759e82c33aa533f616150c682e7f714e60d3f6e229a8a95f32506d4d911b920d39a05bc28caf499a6651b0da3d1ed1ea46bb5e SHA512 262027cb970c5c8bcf0f10e54f2e8a96ebd85d580ba300d2c5e42cc55a27f44f3e6398bb268f7017f5b6ef83527b985674296446e5af30bd25f9aa24dcc4ea6f
 DIST Fira_Code_v6.2.zip 2462987 BLAKE2B 43a65ca180079ba33da706108e798734d6af53686f90db323bf063c9815318b64c1d9ad7ccdf2942c4584bf4bcc7c2a7e544bdc2cb0d1b466ce49db6b4c2d334 SHA512 7f71b34cce960bb5b90165505214d9effa7aa0b9e3ae3a7da37b900db54adbb30d1ff4b44f77c88fe0c7ddef45fc17ac6f05f08745fd26e1a298eeb61e6fddd3
-DIST Fira_Code_v6.zip 2882570 BLAKE2B d90b66f383c64261daf227aa507672ae8e86d03d98bac433e7d361d49cb99fbe3025bd3f7af4f75b17866b62ffc01d361de6a07edbb730d7eef27cde64e1c6ed SHA512 b7b5db1c12cd34b5814144c78d535207a36f6fecd92900496cbf6c88fd457cb429b1e00d469482acbab1118f11e556b5bcac2be5364a60bcba9769bbcd4bac00
-DIST fira-code-4.tar.gz 5580474 BLAKE2B 0bc9b4c8a54f238f1c464398162a56dccf0ac5f4aaffac00357bc7ad0ed99436b44220180f9753a0bc6f2fccc5dafe4a47df9cac91dc87fb1441952e1f04eeae SHA512 037698435b3f77f5ad2dcfb6ea6ff3063c50d224c2b95ada472bf9b12a6342e892d60220e1993045858697fff9c4fb5da97b41ac3437c4fa50f48ef1398c9738
-DIST fira-code-5.2.tar.gz 4875970 BLAKE2B baff9ca088252e03a442860a95a03ae6e8ab59f102be3352e5b3c6a0b709907cc84bf70d4e9880ad5d48fca6a000e021a7453c8666638b4f9bfd0a2a441ddfe3 SHA512 10247bf8b72f4d44a5b5d727edeae2baee549b6654e12469ad3ab75d3926635b4b2cdfcbb2b9b4c89b28d7c5411c428c00729f94567dad3bc0dc23ff5446ce2d
-EBUILD fira-code-4.ebuild 639 BLAKE2B c9cfdd560836b3b43576c86080ad87dab270303b28064997c654f3bacac4798c5c47498bae814273f692829b0f39c140bc777c70103515dda5f9cd926c86a3f5 SHA512 995b9a24dd03c77f5e741947220bd376252121822caabc2ab8a4d09501d8d00bba975d5eb9947ef80dffcebcf5e2aa7ffbf379c27c4ec88e4cc60995560388a5
-EBUILD fira-code-5.2.ebuild 657 BLAKE2B 060666db0f5a284aba60a916b89ad02f18f099e2046e1c6042e29fc885367477ef806f7062bb7744ead0c0ec802b2686a8e8a57ac0ca3ecd09cf98ab51ed0786 SHA512 89c1fb47f24feebfa0c1aff5c32d446d4edec3d4a99c78461cb93687e135d4b0c99ad71db3de40f8d66242ebe217eff35fd4fc5fb12ab3953d797db24975711c
-EBUILD fira-code-6.1.ebuild 507 BLAKE2B f39a16d12a3b73936046280308e297bd297c7c0ad45d123b17516eb324d2c80a479446234d0a1f4caea6034cfaf148acab85ae68ab00494a5fb35c3a7beccb66 SHA512 fa2cd891e1be7601b9231c40bc7b8d53e96033af944dab33845659081b1bc054ae99e0cf12d8674199cf18bab5bd57de682315800c6bebabf32382ee8c7c5dcf
 EBUILD fira-code-6.2.ebuild 517 BLAKE2B 7fab62ec53585675d7938a636ecdf323ec0ddf8279c9bd74f39ceee5ec7bb39cc26bb617d10526f67c3a526b7cdc681375428bbf150924968beda8b228d6f3e9 SHA512 db09e96307ef9644ec0b6f4609b27441009f53e7b663a47bad8421a40890b56f5cf1dc2d58fdc119a1d6a7f41b46cc851a2e07140bdc1aba4c1bb8e62818a086
-EBUILD fira-code-6.ebuild 514 BLAKE2B 4c9fa2b31e7ea5607225ef55b066eb87766cf22c02148e3e4f96f97d5d31bfceede5e79cfdc9d609542a6747220a454123c08ed544edba8645332bf96af9a26c SHA512 4fed2274f448957d14894a0e064f06147dd9a59148687f9ff9cd87d56a1ff453b2f3db0a81875b79c84d63a1ca2be59547ef5abce4a9930a0c4cad2d181cb376
 MISC metadata.xml 427 BLAKE2B 413143907a7856bd0cf7615e0c18123f31a3cd7ef87aa56203973156eca8f864a652e7dd88a4b1bf5396eac9f1c46bb3faee79f3ded48bff1edd6f6d9f67b355 SHA512 14c182de5f3ca04a453ea56bfea9bcf21b57065dc5d64fbb397b390e8f5a633db6ec22be37d9650db6d6b681d3ff2dc04c975d233fd777e6ab15c0c524230499
diff --git a/media-fonts/fira-code/fira-code-4.ebuild b/media-fonts/fira-code/fira-code-4.ebuild
deleted file mode 100644
index c12ec2c68c1e..000000000000
--- a/media-fonts/fira-code/fira-code-4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit font
-
-DESCRIPTION="Monospaced font with programming ligatures"
-HOMEPAGE="https://github.com/tonsky/FiraCode"
-SRC_URI="https://github.com/tonsky/FiraCode/archive/${PV}.tar.gz -> ${P}.tar.gz
-https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-
-S="${WORKDIR}/FiraCode-${PV}"
-FONT_S="${S}/distr/ttf"
-FONT_SUFFIX="ttf otf"
-
-DOCS=( README.md )
-
-BDEPEND="app-arch/unzip"
-
-src_prepare() {
-	default
-	mv "${WORKDIR}"/*.otf "${FONT_S}" || die
-}
diff --git a/media-fonts/fira-code/fira-code-5.2.ebuild b/media-fonts/fira-code/fira-code-5.2.ebuild
deleted file mode 100644
index c5d9b0b44cf4..000000000000
--- a/media-fonts/fira-code/fira-code-5.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-S="${WORKDIR}/FiraCode-${PV}"
-FONT_S="${S}/distr/ttf"
-FONT_SUFFIX="ttf otf"
-inherit font
-
-DESCRIPTION="Monospaced font with programming ligatures"
-HOMEPAGE="https://github.com/tonsky/FiraCode"
-SRC_URI="https://github.com/tonsky/FiraCode/archive/${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
-
-DOCS=( README.md )
-
-BDEPEND="app-arch/unzip"
-
-src_prepare() {
-	default
-	mv "${WORKDIR}"/*.otf "${FONT_S}" || die
-}
diff --git a/media-fonts/fira-code/fira-code-6.1.ebuild b/media-fonts/fira-code/fira-code-6.1.ebuild
deleted file mode 100644
index 811d1d693386..000000000000
--- a/media-fonts/fira-code/fira-code-6.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-S=${WORKDIR}
-FONT_S="${S}/ttf"
-FONT_SUFFIX="ttf"
-inherit font
-
-DESCRIPTION="Monospaced font with programming ligatures"
-HOMEPAGE="https://github.com/tonsky/FiraCode"
-SRC_URI="https://github.com/tonsky/FiraCode/releases/download/${PV}/Fira_Code_v${PV}.zip"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-DOCS=( README.txt specimen.html fira_code.css )
-
-BDEPEND="app-arch/unzip"
diff --git a/media-fonts/fira-code/fira-code-6.ebuild b/media-fonts/fira-code/fira-code-6.ebuild
deleted file mode 100644
index a8b92c582650..000000000000
--- a/media-fonts/fira-code/fira-code-6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-S=${WORKDIR}
-FONT_S="${S}/ttf"
-FONT_SUFFIX="ttf"
-inherit font
-
-DESCRIPTION="Monospaced font with programming ligatures"
-HOMEPAGE="https://github.com/tonsky/FiraCode"
-SRC_URI="https://github.com/tonsky/FiraCode/releases/download/$(ver_cut 1)/Fira_Code_v${PV}.zip"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-DOCS=( README.txt specimen.html fira_code.css )
-
-BDEPEND="app-arch/unzip"
diff --git a/media-fonts/font-util/Manifest b/media-fonts/font-util/Manifest
index c0291a1e52ae..ae6ec4d46d31 100644
--- a/media-fonts/font-util/Manifest
+++ b/media-fonts/font-util/Manifest
@@ -1,5 +1,3 @@
-DIST font-util-1.3.2.tar.bz2 158480 BLAKE2B 490aa54fdbf0e7060a17261e6ac06d30ef374c0ef40ae7473680c192898305c86617667c59f334d54e3ba3eb2464e925a12a5ad4bc74c73f6a62b0500d7c0da0 SHA512 7cac529b12ae71185b89c72c1569b9826f52eeaecc1c76010338e7c42c4078ae339f18220b580bbd68fb5dc09df6ecf169a47c32e6104d8ee53bd443fa21d167
 DIST font-util-1.3.3.tar.xz 142544 BLAKE2B b893159496fb242c33facda98597e200b41d05fbc28c9c1cf04f5214788f421472562a79ad24cffddad72ebf38f751858712a5c7c2904370ea77f501f78ccc77 SHA512 5e1cb8af44fe0bea72b1a6a4e455f50ca49b7531c2f4b605800c0b2b7578b9826ccf17fa195c505ab1d6339fd4ad697c01ba3b9777616f354ab62b23434d47c9
-EBUILD font-util-1.3.2-r1.ebuild 656 BLAKE2B c9f960473fd093553a3fa24a85be7330ca006046295a12ca7318829e3c39fbd4ae4e94608db58a0b612cff92882fea108b411aa5fef2bb57bf77d3c239ff569f SHA512 47a28efdeb978c1ff1377eea887076d5a2c1202ea8ca0e061a9e0b69b5f35091a14ef627c495ffa3d77f74f8c966bb92411945d97d75e43c2e4c19bc098ed32b
 EBUILD font-util-1.3.3.ebuild 681 BLAKE2B 071459b98022db196f40054112d113cc66d5d2f6eb357dabe814882341a2ff610adf4c51aaaef45a59de7781e14b03b91d17b3e128ada0ae8d08a56231628ac8 SHA512 f5700d29852d5f5b325f5c54663c9bcb7418ecfe1ff9ac9f8947c9fae1cf5b105a7dd701a3d4ff084f72ccea87d87d869ed92a03139ccefb845e5b528456c5cc
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-util/font-util-1.3.2-r1.ebuild b/media-fonts/font-util/font-util-1.3.2-r1.ebuild
deleted file mode 100644
index cec2eaf56898..000000000000
--- a/media-fonts/font-util/font-util-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2005-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/font/util.git"
-DESCRIPTION="X.Org font utilities"
-HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/util"
-
-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"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-fontrootdir="${EPREFIX}"/usr/share/fonts
-	--with-mapdir="${EPREFIX}"/usr/share/fonts/util
-)
diff --git a/media-fonts/intlfonts/Manifest b/media-fonts/intlfonts/Manifest
index c1537fc3363b..0471007e28d5 100644
--- a/media-fonts/intlfonts/Manifest
+++ b/media-fonts/intlfonts/Manifest
@@ -1,5 +1,3 @@
-DIST intlfonts-1.2.1.tar.gz 24360787 BLAKE2B bf75f895832310719d470e49ca206a6b888720c44927ac967ad6dabc19288d4220afc70bf38358899229315e25b5c473786838a2207c41c48e35765cd3a4d621 SHA512 c11508335cf0f819e7907a6b16c305fbfbf1182dbdea939773482bda3c0f27d70ba427ca3d22c62f4190c24f35bb2bcde4e4fa185aff7f4964293263f7b4304e
 DIST intlfonts-1.4.1.tar.gz 26437950 BLAKE2B 57bdb2acb6d90362e6b2ab83d509638170c751aa26c803907dfb8f8db73a0190d112175815deab92866eb0af97cd4da11edf9cebdf6733e01bd32e93ed863b0e SHA512 6d070de3103c655065a904fce9a8c883f7c4fc12f42e039984cf40884853f57c88fb6c13221dc367c371e0e8585ed54650cfa69ae886cfae2a74df22ead95c06
-EBUILD intlfonts-1.2.1-r1.ebuild 895 BLAKE2B 5886da28429049b995c5539cc7a9bac851e506c229436cdeb1976c9c55deecff9c851827f8c5d34d47341add7c0b5d2976f40d2d64c9d30f04592d24192e8a1b SHA512 7c95cadc6490a2db89083f299cdb81b8b8ba078e66302fa71e09efe827268d49daf581e106f326ca2741b54a2c4fcea24717c3b515f0d1b918776a3e851989a4
 EBUILD intlfonts-1.4.1.ebuild 752 BLAKE2B 6f6fb990edcd431526b975bacc21e6bcd328829a28c27c7629e65d74f2bbcb4f2d0f339dc1412d5e9872990a039a0b928d014a56164db9961f1f73e641d77fac SHA512 9362524649e42ab03a697dec7d6faf598b672816eae30d8a56b76e7b07963c31126b23f76d30771bd71b88b8fd90cf83ad888358f70f697c035804ef5ef20e03
-MISC metadata.xml 371 BLAKE2B 8c50b31dc090d90604bccad0980c27079e5b99010ba56a8c9b2b44da7ccfc7f300b9f0702bf8b1db32ce605eb79ed3f94781fd91d2f8604105622630d49f2ffe SHA512 d7ee88307a79bb30b41b622364dc0bdd03dccf284c3162ba49f2ddd37305eeed8ae4f995edf4f7abff428cb72595466ee3b445186fc919132b61b402e05a4816
+MISC metadata.xml 310 BLAKE2B c670adef89744616a64e2cb0a341c0bfe813f71485d98b8c1aa0d40deb797101a3553d33c99b2fcdd1a583cb296bbda0b1d5ad26d61ec976cfdcb16ca87a918d SHA512 16c6a6aad4840514c8055c1870732b8db1504570c56789515433678d1a58b7a8ade8b649d0e457c496f25de439cf2b745c4ff4adc99b615ceb1cacf14413ccae
diff --git a/media-fonts/intlfonts/intlfonts-1.2.1-r1.ebuild b/media-fonts/intlfonts/intlfonts-1.2.1-r1.ebuild
deleted file mode 100644
index 93ee81bfb5c2..000000000000
--- a/media-fonts/intlfonts/intlfonts-1.2.1-r1.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
-
-inherit font
-
-DESCRIPTION="International X11 fixed fonts"
-HOMEPAGE="https://www.gnu.org/directory/intlfonts.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="public-domain HPND non-free? ( free-noncomm )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="bdf non-free"
-
-DEPEND="x11-apps/bdftopcf
-	>=x11-apps/mkfontscale-1.2.0"
-
-DOCS=( ChangeLog NEWS README Emacs.ap )
-
-src_prepare() {
-	default
-	# Tibetan fonts have a non-commercial restriction
-	use non-free || rm Asian/tib*.bdf || die
-}
-
-src_configure() {
-	local myconf=(
-		--with-fontdir=/usr/share/fonts/${PN}
-		--enable-compress='gzip -9'
-		$(use_with bdf)
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake install fontdir="${ED}/usr/share/fonts/${PN}"
-	einstalldocs
-	font_xfont_config
-}
diff --git a/media-fonts/intlfonts/metadata.xml b/media-fonts/intlfonts/metadata.xml
index f76a750d6ffe..609293a1639b 100644
--- a/media-fonts/intlfonts/metadata.xml
+++ b/media-fonts/intlfonts/metadata.xml
@@ -7,6 +7,5 @@
 </maintainer>
 <use>
 	<flag name="bdf">Install BDF fonts in addition to PCF</flag>
-	<flag name="non-free">Install non-free Tibetan fonts</flag>
 </use>
 </pkgmetadata>
diff --git a/media-fonts/ipaex/Manifest b/media-fonts/ipaex/Manifest
index d37c4142f15f..81b691228390 100644
--- a/media-fonts/ipaex/Manifest
+++ b/media-fonts/ipaex/Manifest
@@ -1,6 +1,4 @@
 AUX 66-ipaex.conf 688 BLAKE2B 5cf4e28254e7134f837dd6a702c40b0d8885ce3df760c46d552146d946a3fb58df3a61da21dc53c0eaa4fc8c25725b4fb6e218a215f2e984e5069f86b9833688 SHA512 8e3de87f7ce44c10e2e0a1989613c6fc4fecfafb85ba4a4efb2f71e906bf9f7750f04fabfae71196b8b69b55da7ebec0d89ad5d7b8141e9f584b8ff20309a743
-DIST IPAexfont00201.zip 9764230 BLAKE2B ca059ee52fdacc444a971ed63371a03af98ae37210b2a46f4055abed49b27ca61f4c617098bfeb902426a7b51551dd92d8e864bae251fd047089b1f3abffc8cb SHA512 d23c4d320b0d69067f65054d8e14f8b65dc06f545d1c021f6146f34d980c1e655ed070d4d520ed810272fc7f7f6dd906b3e0da4d89514d8f3fcd2be83a3961d7
 DIST IPAexfont00401.zip 9738669 BLAKE2B dcf7d019157dc8907ee7595837728c82038b1276c336bdff7e410722591f1f32bd2e2559c383f637bd9935f911d9f274a5dc28e9432989bb233b5e15980b088a SHA512 fe639ded0a25eed66df8cc1e9d5e965b501574a25fab542a749b3cb8464690448e44343ff5845aecd3224ec481c4089ee56e64880cbbc9211a260b22d4cc68cd
-EBUILD ipaex-002.01.ebuild 609 BLAKE2B d39c414690f42db086c1bea53b503866c918bc3c73f86a4313d173834c5f821cf71f358f8529392f63c8435869877daa511b7e7a479c9986e546eb78264083d5 SHA512 05b55b43f114686adda417815f411a6485540ed97ea360ecb4c24e7260ec1523f062e7b467dea02ace2118a295909484821743169e9e03312d769a917ebf054f
-EBUILD ipaex-004.01.ebuild 624 BLAKE2B 09d7610a454af64899cae94c9a68136477f35be17db910395feb5c9f0f02ee19f42927d19cf0d4a42b058090a070b1b4de44ec88264f9717f876e9e678ef36a1 SHA512 4fc6fde29188e7fff52b138485587e1cdec22668082ad810be617df5bd09613a9a99a437e5c0bd50b0e15cfbde5bbab69500d38bfc61c606251ee1b5b8054531
+EBUILD ipaex-004.01.ebuild 623 BLAKE2B 624197b414b2bca032e58647422819a1b52501952ff6637244378de6cf7e121d4fd926dd23940de80ab7e63aa4f6c6c6f7724cdb0f95ba12799215b2f4c2fa02 SHA512 58bb105524beae47fc98c001dddc762154bc5525ff6c587e9576218cbbea975491cb3f1b9db95a26ad401f917d5d39c93cab564a61fb872a9f147dcb7beaf62c
 MISC metadata.xml 358 BLAKE2B e5c61be8a478e8cecf6026c69b27835834d6f9b9f2fce31bf0ea9ecd0321feea04acac82704dbef516b4b76251dfd4b6388d9f9ed4eea4bcb042c89f02a951cd SHA512 c3eac4c7b5a91ce87a7d2a77422e9d22ce60c753fdffe2bb72426b05595a7699bc6a8a18efe343183f58b94df49095629e42beeb2b664175fc59869c5efb7946
diff --git a/media-fonts/ipaex/ipaex-002.01.ebuild b/media-fonts/ipaex/ipaex-002.01.ebuild
deleted file mode 100644
index 31db6cb9ce4c..000000000000
--- a/media-fonts/ipaex/ipaex-002.01.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit font
-
-MY_P="IPAexfont${PV/.}"
-
-DESCRIPTION="Japanese IPA extended TrueType fonts"
-HOMEPAGE="https://moji.or.jp/ipafont/"
-SRC_URI="https://moji.or.jp/wp-content/ipafont/IPAexfont/${MY_P}.zip"
-
-LICENSE="IPAfont"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-RESTRICT="binchecks strip"
-
-BDEPEND="app-arch/unzip"
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( Readme_${MY_P}.txt )
-
-FONT_CONF=( "${FILESDIR}"/66-${PN}.conf )
-FONT_SUFFIX="ttf"
diff --git a/media-fonts/ipaex/ipaex-004.01.ebuild b/media-fonts/ipaex/ipaex-004.01.ebuild
index 88707e13a8c0..a0b8dd6bd04a 100644
--- a/media-fonts/ipaex/ipaex-004.01.ebuild
+++ b/media-fonts/ipaex/ipaex-004.01.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://moji.or.jp/wp-content/ipafont/IPAexfont/${MY_P}.zip"
 
 LICENSE="IPAfont"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 RESTRICT="binchecks strip"
 
diff --git a/media-fonts/kanjistrokeorders/Manifest b/media-fonts/kanjistrokeorders/Manifest
index 3b06e86cb9f0..adb9f59e7347 100644
--- a/media-fonts/kanjistrokeorders/Manifest
+++ b/media-fonts/kanjistrokeorders/Manifest
@@ -1,5 +1,3 @@
-DIST KanjiStrokeOrders_v4.002.zip 9453962 BLAKE2B c340e53f4fa8fd56aa267cd5b9b1d9ebb15adcbe814c9ea00b9adacddbfee70e4925c7fa6a8939d16d0935e9c0067d69ba4dcf9ce9af346c2b457c001631b905 SHA512 49b5f5dbf70e900e547d5d0fb2fb51d2e8dc73e6dae3ee46e197ef5e2187c445fc39ca69cc69b5e7612b600e065cb17e760c3f48b6b7dde8f6ccccabb3382a6d
 DIST kanjistrokeorders-4.004.zip 9028084 BLAKE2B 95c763e6c6d0ec0be7f451539bc13aa6d0abb6a73c16cd9a4fab42d6ca380ceceefaf30ddea341adc10e2eaf0fdf50e26e83babb27819f97a35a0c9d450bacd8 SHA512 54a0820031da19289b820300f2569387cef77bc80f7febe9d28c88d4c3aba53973d1c8ede337a689508a28fbbf8b8a4d5a4896c2db353774229370ff9fdd01e8
-EBUILD kanjistrokeorders-4.002.ebuild 527 BLAKE2B 173856ceb5d20018e0b16ae31a34c3b0ffafc3bda7f331fd9d229a08446e9b2366c5c3304da08357a1d7b8ba2f03222eb7ccbda863f0186bad342c5596b0d0b8 SHA512 36900ef69f239282ba124413c787cf07ed2496e0f2fde62092a0ca7fa53911141993c037a56c1f7888a5e52c33cc74f811206ac6409711c95a4fa249aab74003
 EBUILD kanjistrokeorders-4.004.ebuild 545 BLAKE2B 72df47e5fb3391fd38a24a3e1bd82a9ea58e281dc0a81303f6f1660a55f557dd4dd01fb15f750f8002455b004fb38fc61c717ee9a9c2bb80992eb85cdb5f8261 SHA512 17ea9015f1451b4640af6ed687dcf2326b22c0b1ccab1733e3361e9a4f09d13064528a514c92e38cdd161d25044e7c6353b33f6b67b659ee3161ed0446a153bd
 MISC metadata.xml 333 BLAKE2B d55a520fdae95aa984ef8fd202229e1308e2d07b8cd3da5a2f4fbc4e552c6d5321fc0de021c3d8ea718c2cebb3dbbd75f4d364335756f1eaadb0eee53bc37d4f SHA512 0021239202b87e9354a68648f57c8a15a37e23d99f46788e9e7d3984a649e1601cdfefa8cdfaef25fd6e89dcb3dacce05d28da6c2a523041cfe6d3233e1fa9d4
diff --git a/media-fonts/kanjistrokeorders/kanjistrokeorders-4.002.ebuild b/media-fonts/kanjistrokeorders/kanjistrokeorders-4.002.ebuild
deleted file mode 100644
index 3257c5f73bb4..000000000000
--- a/media-fonts/kanjistrokeorders/kanjistrokeorders-4.002.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2009-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit font
-
-DESCRIPTION="Font for viewing stroke order diagrams for kanji, kana and other characters"
-HOMEPAGE="https://sites.google.com/site/nihilistorguk/"
-SRC_URI="https://sites.google.com/site/nihilistorguk/KanjiStrokeOrders_v${PV}.zip"
-S="${WORKDIR}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-RESTRICT="binchecks"
-
-BDEPEND="app-arch/unzip"
-
-DOCS=( readme_en_v${PV}.txt )
-
-FONT_SUFFIX="ttf"
diff --git a/media-fonts/liberation-fonts/Manifest b/media-fonts/liberation-fonts/Manifest
index 4d80e67b1826..aeeb6989a362 100644
--- a/media-fonts/liberation-fonts/Manifest
+++ b/media-fonts/liberation-fonts/Manifest
@@ -1,8 +1,5 @@
 AUX 60-liberation.conf 1055 BLAKE2B 066343b8a6a6b1a17deb54718404a723d56aa354b3125caea83fc432bf8ed9f11998403a626117d403be478cbb83961510b1bcc17e885ac8e1d3375c7760d8f0 SHA512 dcc8066e511db34ed007df018fd2d24a9e4020e382e0f12bba8fcedac5c8a93f917885c09919e3eb38bf73b94f59eb16fc4a894952dc9709c2b12353542cf117
-DIST liberation-fonts-2.1.2.tar.gz 4976962 BLAKE2B 934b71cbd45ba94b6cf18fc81942004beefe2dba860f13e885930b423208aa0b2f328f3d6e95f65c16017fdf40d51c25bf2b94d8654e3118fd347a00253056fc SHA512 9eec48e3a87d07499969926204fc9063d9d196894b95536b506988041b1965064319a2686bf54cbaabf836f54323816fe0d2a74ae14249366791de94da630e29
 DIST liberation-fonts-2.1.3.tar.gz 4977444 BLAKE2B 1d77ea6a9aa850a3501a7051bf3e3cd75923bd77dca5d42ae3fa4fbe7be9fea104779caadcccaf2608dc6423bddb3abd199defcaae3161ecd997268078b6781e SHA512 826c002008c2c753957ae4228d8e5dac5b1de995eb7cf392e9cbef9a23bb438ff56303bb9e8ee45a52fb9797e5685b89749f6a689413537f9cc7ee8067dea463
-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 1281 BLAKE2B e3b29638c8679f8f3b91c295b860376870356417d505510b38509b031609cab4671daa415f075985f64014dbdd4822132f5149643a724465dcfc6de80b6ee316 SHA512 79e2021cc17b1586c370aa38cd493b2af01470e731c166907cf21d5760cb76371ec41a14613f5fbe10272c9bfa503bc656bba48da435e8b82b42eae062faae5f
 MISC metadata.xml 372 BLAKE2B e886d18e0829503cda2a92c2fce4d6f16ac3ede48075333687718ed2d042b0b14b18e067396b10241538e11c62c82e677a2bb15dc3a74310eaa0aa350172692d SHA512 6b8d88e17d0fd67bfddf89b7cfc0bc8677a16cd1b75354ccc900d7d5feee76cae6388867a21f4906c1c18a9a503f1dcf876dd36b7e3d8f7b374099a13b08cd20
diff --git a/media-fonts/liberation-fonts/liberation-fonts-2.1.2.ebuild b/media-fonts/liberation-fonts/liberation-fonts-2.1.2.ebuild
deleted file mode 100644
index 36b1a4b57d66..000000000000
--- a/media-fonts/liberation-fonts/liberation-fonts-2.1.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit font python-any-r1
-
-DESCRIPTION="A Helvetica/Times/Courier replacement TrueType font set, courtesy of Red Hat"
-HOMEPAGE="https://github.com/liberationfonts/liberation-fonts"
-SRC_URI="fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/5722232/${P}.tar.gz )
-	!fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/5722233/${PN}-ttf-${PV}.tar.gz )
-"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
-SLOT="0"
-LICENSE="OFL-1.1"
-IUSE="fontforge X"
-
-FONT_SUFFIX="ttf"
-
-FONT_CONF=( "${FILESDIR}/60-liberation.conf" )
-
-BDEPEND="
-	fontforge? (
-		${PYTHON_DEPS}
-		media-gfx/fontforge
-		$(python_gen_any_dep 'dev-python/fonttools[${PYTHON_USEDEP}]')
-	)"
-
-python_check_deps() {
-	has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-	if use fontforge ; then
-		sed -i "s/= python3/= ${EPYTHON}/" Makefile || die
-	fi
-}
-
-pkg_setup() {
-	if use fontforge; then
-		FONT_S="${S}/${PN}-ttf-${PV}"
-		python-any-r1_pkg_setup
-	else
-		FONT_S="${WORKDIR}/${PN}-ttf-${PV}"
-		S="${FONT_S}"
-	fi
-	font_pkg_setup
-}
diff --git a/media-fonts/nanumfont/Manifest b/media-fonts/nanumfont/Manifest
index 14a3d7fd3378..363cba21acdb 100644
--- a/media-fonts/nanumfont/Manifest
+++ b/media-fonts/nanumfont/Manifest
@@ -1,5 +1,3 @@
-DIST NanumGothicCoding-2.0.zip 2038498 BLAKE2B 965cea0994f106d44d68a2f348c72d76d3d943b068380fcadb2ea81db22354a84a301c452b596e7e2da2542cb3a6172a0dffdfc760c36aca7a782c0211486d74 SHA512 c69cf0dc2d72cac4f38a9ddfa90fb268b0d6673a9b74d728bf3fd08811d5cc8599cb17dae2a0e63e064aca0b733a56da27ae2fcc1efe2b02da631b14a54e1f3f
 DIST NanumGothicCoding-2.5.zip 1707449 BLAKE2B 234e422470e8288c794e1ea484b9f6166dd8d1d813bdde6c9a1f86d60cffde617764d80db2ddbe136da96da9c6852addc1cad7e739bd216c7d1b9f228c77f12e SHA512 126e90586ab2ec7bcdc07d3c0fbe75b8aa6df4ebf79032ff0bef344a5a133286356ec6cdfe7958c8ef24c086dd6d6505687fd0c1f11f4b8bff979d199ba4e1b3
-EBUILD nanumfont-2.0-r2.ebuild 787 BLAKE2B 9e3c9fd222e12f0c480c6d861e9460da68b12e6ef347ec0a47de34510ea187c72be1400351a929dbf245bfdb555f749a9a0a19a522bf86201e2b84ed068e050b SHA512 eea6da25bd1f3fb2119b8985eac5f536dab9e1332bf8084b54c94a2cea9062b12ae0c00c670f5886ba91b39e9471877519feb40772e25e60c63bbc9fec296fc9
 EBUILD nanumfont-2.5.ebuild 495 BLAKE2B 39789c1c8d4bff1f2f13b263bbca4bb3ed252b42acd4d38d610f334089d10946bc45ae6dce9c036fb31fc2d8d809edcb0a253110d168d9b98c39ab00a0fe8f69 SHA512 d3675a1e2e3ebd8fd242dacd66c801e591d6ab1a0560003908374193741b7cf46e00387348139965dde549ff5bfa15582556ce423f2c48873dbfcc4a5db6ee2e
 MISC metadata.xml 414 BLAKE2B 238925929ae14fe868f8bb00424f24f74ae67a37d3b5d5ccfe64d697dbb60a082d4388ca0e6b9afa170fa6fcff93b622ceb931c501ac32ff6ef0e8795530285f SHA512 6627927f24d5c38d95f4c1d49b68b7d6083b4fbd61a3f14209ebd6aec592c4c3ad57adf780ba9473698ebd4360075c7455bf24da725cfdbe271c6b9ed6ee68f9
diff --git a/media-fonts/nanumfont/nanumfont-2.0-r2.ebuild b/media-fonts/nanumfont/nanumfont-2.0-r2.ebuild
deleted file mode 100644
index 2312663368b6..000000000000
--- a/media-fonts/nanumfont/nanumfont-2.0-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit font
-
-MY_PN="NanumGothicCoding"
-
-DESCRIPTION="Korean monospace font distributed by Naver"
-HOMEPAGE="https://github.com/naver/nanumfont"
-SRC_URI="https://github.com/naver/${PN}/releases/download/VER${PV}/${MY_PN}-${PV}.zip"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="strip binchecks"
-
-BDEPEND="app-arch/unzip"
-S="${WORKDIR}"
-
-FONT_SUFFIX="ttf"
-
-src_unpack() {
-	if has_version -b "app-arch/unzip[natspec]"; then
-		unzip -qO CP949 "${DISTDIR}"/${A} || die
-	else
-		default
-	fi
-	# Rename names in cp949 encoding, bug #322041
-	mv *-Bold.ttf "${T}"/${MY_PN}-Bold.ttf || die
-	mv *.ttf      "${T}"/${MY_PN}.ttf      || die
-	mv "${T}"/*.ttf . || die
-}
diff --git a/media-fonts/sil-gentium/Manifest b/media-fonts/sil-gentium/Manifest
index 69dbd6f76ea5..ea0e5920d35a 100644
--- a/media-fonts/sil-gentium/Manifest
+++ b/media-fonts/sil-gentium/Manifest
@@ -1,6 +1,3 @@
-DIST GentiumPlusCompact-5.000.zip 2089135 BLAKE2B 78d734a3289c1577869fb57126f66f13eccf268f8665fa15e9c4f34cfe43a52ba9e10e00d35382d5745070a6ce43f2c75622706185933e151eef3a6b340f2e0b SHA512 1959ef4e1e05a3d1fb68b2f89e0b90683508239118a7fcad8ba667753635790fa6a5c882111128150e8c9f71557947a11d7a156f931326a5844213094bec16ac
-DIST sil-gentium-5.000.zip 2025499 BLAKE2B e13130aaff0d3893260598605c2332e7316d451e544efead87bd527a275ef1565e5b76ddfa3491b32bae77cd773f3d52b1d063851a0f694a54516c65fef15c92 SHA512 6580fb6717154d25230c837ca6150265349171cf2ad670b638c5029e034ba446dd6adb9508c9b667c6ebad1b05357326f7684daa5517df55235a8728c48f419b
 DIST sil-gentium-6.001.zip 9720134 BLAKE2B e1e9bf13db0fe0435e9e3feb9a5cd0621f6c5e7ed4b8e4de15bfa6ec9985df2140b61046b9210e82550be14840512969dea8cc12e6949e3a9506547b604f35cc SHA512 d9d2997b40ec02876051f13b2a2295cb292d7f4ebb8fc88b887f69d8629e623430d4319fbcaed46dbe7b2b798f567cc42e7aad75ffcb9edfc5579c48c384e5a1
-EBUILD sil-gentium-5.000-r1.ebuild 911 BLAKE2B a1bc3a198c7d53422ed06e816ccc8070a9bfdc6fdfc51c9329031668419cc45273261628c3c27d884d1c4c00a5df646fb91f0d968afc7e3cbc23d2d5fdecd04e SHA512 cb5916eca08f4c4516885ab35be04b73d668be15873a668948de7c46942685301792e6d938c00176bd9eb3bf9618b31799c840aba36e90abee702a19fa582076
-EBUILD sil-gentium-6.001.ebuild 740 BLAKE2B 11ea1257faab2f7c61c4fdedbb06b8ed46e69519afee6590605d9fd61adbe93fd09e2fb8dd4d9621088d63df701c950c883a654d54b2edf05e6ebaf00b9eb506 SHA512 2f5a8eb81f98e83f703d2391db7f6209cca07fc41f5f86cad34146a441b3738643d1d54d042fe477ea515e606842535619cba2b4235ff2e0db75256d92a1a780
-MISC metadata.xml 1118 BLAKE2B 769bdd6b66130719f928da4d66a9b2a0f19d83f4ad9a9637610ba9a99009bdf7f857da82643959bf16a33e60f6a01b22dcff436d2dd313b10546843a9f2f4b40 SHA512 a23f1299d0cd65637e310b07ef34cdb2cd384ab9df8ef6e1760188bb7fa0afb393b2637ef8adfbfcc7e1233a94cc6cc74c23eec024742b6bd397f10d57f4d80f
+EBUILD sil-gentium-6.001.ebuild 739 BLAKE2B 97eb3f1135d28d96eb5145f0c3acd9533a759e431dde4f4a4b6658bca63593e08b116acc1c07f19ae5ba4dead245ca22d84e2b7238351f069a86aecf8572aa1a SHA512 5507095542d028439776576779ab6c55150dc070cad24b261bfed9b11b6ac54111b8d492890029d3d9315ebb84b79a4c0d8d9d9604ffedb8611df9383e6577d3
+MISC metadata.xml 1026 BLAKE2B 3ed9aa0aada31fa43e8cab66490f697dd6b6d1224f495f52208233f89766f463a2d7cfe27a0631b293312d9deed8d3ac52c307315105de2e29ade7237e6cddea SHA512 3522210300e340e94ac7d4b5da47cce6ded63ca2776e60e9af8190f645ff2111e839248d2e56ad39818b8604988108c87900071dcf96e435f6829c9f0fea6ae3
diff --git a/media-fonts/sil-gentium/metadata.xml b/media-fonts/sil-gentium/metadata.xml
index 7ad25f5b88d0..1995e6560782 100644
--- a/media-fonts/sil-gentium/metadata.xml
+++ b/media-fonts/sil-gentium/metadata.xml
@@ -19,7 +19,4 @@
 		Gentium Plus now includes more extended Latin glyphs (Unicode 5.1),
 		archaic Greek symbols, and full extended Cyrillic script support.
 	</longdescription>
-	<use>
-		<flag name="compact">Also install more compact version of the font.</flag>
-	</use>
 </pkgmetadata>
diff --git a/media-fonts/sil-gentium/sil-gentium-5.000-r1.ebuild b/media-fonts/sil-gentium/sil-gentium-5.000-r1.ebuild
deleted file mode 100644
index 8f3216b13978..000000000000
--- a/media-fonts/sil-gentium/sil-gentium-5.000-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2004-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit font
-
-MY_PN="GentiumPlus"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Gentium Plus unicode font for Latin and Greek languages"
-HOMEPAGE="https://software.sil.org/gentium/"
-SRC_URI="https://software.sil.org/downloads/r/gentium/${MY_P}.zip -> ${P}.zip
-	compact? ( https://software.sil.org/downloads/r/gentium/${MY_PN}Compact-${PV}.zip )"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos"
-IUSE="compact doc"
-
-BDEPEND="app-arch/unzip"
-
-DOCS=( GENTIUM-FAQ.txt OFL-FAQ.txt )
-
-FONT_SUFFIX="ttf"
-
-src_unpack() {
-	unpack ${A}
-
-	if use compact; then
-		mv "${WORKDIR}"/${MY_PN}Compact-${PV}/*.${FONT_SUFFIX} "${S}" || die
-	fi
-}
-
-src_install() {
-	font_src_install
-	use doc && dodoc -r "${S}"/documentation
-}
diff --git a/media-fonts/sil-gentium/sil-gentium-6.001.ebuild b/media-fonts/sil-gentium/sil-gentium-6.001.ebuild
index 7a152adcc0d0..61d009bbee06 100644
--- a/media-fonts/sil-gentium/sil-gentium-6.001.ebuild
+++ b/media-fonts/sil-gentium/sil-gentium-6.001.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos"
 IUSE="doc"
 
 BDEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-padauk/Manifest b/media-fonts/sil-padauk/Manifest
index 10d567f3fe30..9763e803714b 100644
--- a/media-fonts/sil-padauk/Manifest
+++ b/media-fonts/sil-padauk/Manifest
@@ -1,5 +1,3 @@
 DIST Padauk-4.000.zip 1316567 BLAKE2B 466d9aedad691afa7ae94a24652b156888cda2a926846fe705c953e711b00bff7c053b1f6d4e4ae4989a6fc91d87e984539315b84c0fff10815b8cfd18b80da1 SHA512 3ed97d5e8b47f8883bcab980aeb4247f4878ef8306773abdc4d1387817a3bdd5d8981c01cebbcd6b1c8dd7507d30a3b2879d607df66fcf7bc33d3db5d029016c
-DIST padauk-2.8.zip 556033 BLAKE2B c957dc2b65802010fc4f888ed2e900441030ae161b1f8fa3e0ea9c5d6ff403127a84ff4eebb00efa48968699392a9a8d242657e68cccf08daf8a76fa17ed8898 SHA512 7f9c4f89bf1c2ee097e0beaada6853b2b40d8e1cd557a94286382a412af2e8fefd30b54b302ba569fe75f281ac9c3b9e8b2210102adde9578bc4bae0114929dc
-EBUILD sil-padauk-2.8-r1.ebuild 443 BLAKE2B af48aedb8448a695795818e75e2b190f5f4733bd0c652007fdeccae732d940a26d65ef0b32148936e1bdf1b2f5a403d635a6c32c2d42439a281696decfc652fc SHA512 6094589ef8560a3ce475f0284a18e3e09033c763da544c8d3f03816655f88cea4ad34a469348350a4011fa55163791f3a6309098f9700a9bf3f2fc44508792f5
 EBUILD sil-padauk-4.000.ebuild 489 BLAKE2B 253961ae4315743c2d21062ddf77bc11298d3554689cc00db01c1d10cd526b068ab6671599fe3f946bf115ac792b4fcd7703598b973173f5d83a368371b17789 SHA512 9726fae6320f7a4bf8c08cb7eac37c0b5eac2488c8d50f9346579cc7ce256fd08f339d022e3636fe5bc4971754dcc6e3fcabd87cde826378e842a58f93fd9f3f
 MISC metadata.xml 415 BLAKE2B c0e161f608e6b211fd17d819f7925608525c73de2a310f9bbff99aee64dd5e6ca644ceaaf658debd37e73a8a6641821ef13457ed4dd5b5e4ef0c1fe39657d343 SHA512 c0a5544675f3bb2276ce8f673ccc472ece76162e61c1ebb5585d51deffd9c3dd2148f3935b043b620a11c9fe197e76d4c5b7be43ba8375874ba6dec94cfe1282
diff --git a/media-fonts/sil-padauk/sil-padauk-2.8-r1.ebuild b/media-fonts/sil-padauk/sil-padauk-2.8-r1.ebuild
deleted file mode 100644
index a8facac41705..000000000000
--- a/media-fonts/sil-padauk/sil-padauk-2.8-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="padauk"
-inherit font
-
-DESCRIPTION="SIL fonts for Myanmar script"
-HOMEPAGE="http://scripts.sil.org/padauk"
-SRC_URI="mirror://gentoo/${MY_PN}-${PV}.zip"
-S="${WORKDIR}/${MY_PN}-2.80"
-
-LICENSE="OFL"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-BDEPEND="app-arch/unzip"
-
-FONT_SUFFIX="ttf"
diff --git a/media-fonts/stix-fonts/Manifest b/media-fonts/stix-fonts/Manifest
index 27dd3d273bac..7d522996f7c1 100644
--- a/media-fonts/stix-fonts/Manifest
+++ b/media-fonts/stix-fonts/Manifest
@@ -1,9 +1,7 @@
 AUX 61-stix.conf 1929 BLAKE2B c44515faed76fcb503fa0a51f0b9c7a1a805fad718afcf547212ce73a7c42d6e55cba7fd401756dda1b11cf9f9cc182244d58503ca3f8638e74e81e0cfa30008 SHA512 578b29a2703f393d002e343a4184952f32a20272af6cc925d21310ca5163a88c8a50cf04c5289ad55df29845b62efa6a9773c8310022e82901ec896d92688de1
-DIST STIXv1.1.1-word.zip 1834654 BLAKE2B ddd240876ae432a5796b70c7d4adc7f44446db7883b4bb3528b223d729a28cbff6f589e7f06323859397a4c9dcad34a1d5dcb9092977a8ae323b4adf1ee5ea64 SHA512 df5171f1a2de4e4e513013b47943cc8f7e210c59ddc11bb4d1f7d07680d7efdd0c73c96a349e523fbca24782314ded81a4eeb1b87aeb2a2c81d00fa9dbcd4b11
 DIST stix-fonts-2.11-FONTLOG.txt 27987 BLAKE2B b29daccfd54daaa59e694bf105d566fb14e4b4c8bf732dd9eccbdd610983e0fc3798a8f8c3bbca80e86190f9e44cdf27e527a721c0ef548addcf39c3f240c6f6 SHA512 3cd3c87b5b8c7ba4e4f76ed95349a375c5a365303f0e9a8bb26922c8b4382e47f4903531dacffd9f2d6df8bb0be8f50fb965695fc5c5ed69c443345140952067
 DIST stix-fonts-2.11-STIXTwoMath-Regular.pdf 988219 BLAKE2B 614fce509b4890aff9732fec997e1665bce256a381457a00b4508ebf052a2aeaa264bd13917c0df34610332a15fbf9a0951f00477d9e17bfb156bc62aff584c6 SHA512 be03b5539bff41b904a4971e07d717d2b8b5bc4805f05c18bb56ec79ee07d38dd7bd1274c0887fc3019594aa09945e59cee30a22a0406c7985dba72245987861
 DIST stix-fonts-2.11-STIXTwoText-Regular.pdf 371400 BLAKE2B 874d78aac0cf335f5d7a616ca54b8efd707d15a7e4a9d6c18541f277554688fc321f51d3c13d7ae9c55a916b8e4a17730c63c7886bbd81c509b6883c97096e5c SHA512 2cdfe0f3906480e8449c969ee52ece50322b27bf1d9f3da664086d0846fd5fdf007d5e1daf181a0cabc8b9a5c63645722f7ce3d3cd69d3930c6b3d3474e7f032
 DIST stix-fonts-2.11-otf.zip 2151460 BLAKE2B 77640182e9672a7d478068aafcd527620c3d1326af2670b8fab96c61fc0944b7158831c3262a09061cb3e66e81562f91078a1432740d4b733787699b740dfac8 SHA512 629723260c79cd2ee2e07e4b70a3022e6ad2dc476088108a17f85276673b28933b327f76f945b373b66cc52360df14ea4dcd8d9c9f4424af06d065eeda010208
-EBUILD stix-fonts-1.1.1.ebuild 679 BLAKE2B c20d1e6d0077b7d04fbccbeb2383bd003ffc10d0c589691779c8941b636e2b4be443811dbc074d404771bdbce3db63b9d525ba4c62e82c8ad2e39adf454794dd SHA512 6f052ba2927acf04090864f705d8187a540d34f5a8b86476167ce4b3a1d56887dc1063dfb6bc780e9f31c09ba6774efd6cce67ad49c84f8057e1eae8125f9574
 EBUILD stix-fonts-2.11.ebuild 1010 BLAKE2B 696af6200ee4f2090c40203f474ddf8e1a66048818737386d621570c7e41bab3337cb7f9bf188fc3012376d03fc1a2ca5531f6bded9ceb4dfb72b7b3a90902f3 SHA512 5d9d17250abb1cf603346f06a42f072e84adb0c7ca819cf0e61c342466fd101b4ef49e66ff14aab2e6ab76fa958443c8eb90a1b762a4707ac238bfb82a618a99
 MISC metadata.xml 342 BLAKE2B dd7f8af5a8462739b56734b464eed5195b9144e5b9ac271d547148a7b11579a9c2b22efbaec70a8c9beace3328f5100df41e11f7f1449213ae0eb746aa73f828 SHA512 2eb6fdad7e3cdcde154d5fdcc04d683b0efd01d4b561db19d72ec215aa9bd409be6d136ec16350142821a97ef2c8d1a8891fb27a8816f493b7cda87bed7b78bc
diff --git a/media-fonts/stix-fonts/stix-fonts-1.1.1.ebuild b/media-fonts/stix-fonts/stix-fonts-1.1.1.ebuild
deleted file mode 100644
index 21614ffbeb88..000000000000
--- a/media-fonts/stix-fonts/stix-fonts-1.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit font
-
-DESCRIPTION="Comprehensive OpenType font set of mathematical symbols and alphabets"
-HOMEPAGE="https://www.stixfonts.org/"
-SRC_URI="mirror://sourceforge/${PN/-/}/STIXv${PV}-word.zip"
-S="${WORKDIR}"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE=""
-
-RESTRICT="binchecks strip test"
-
-BDEPEND="app-arch/unzip"
-
-DOCS=( "STIX Font ${PV} Release Documentation.pdf" )
-
-FONT_CONF=( "${FILESDIR}"/61-stix.conf )
-FONT_SUFFIX="otf"
-FONT_S="${S}/Fonts/STIX-Word"
diff --git a/media-fonts/takao-fonts/Manifest b/media-fonts/takao-fonts/Manifest
index 37036ccf686f..97a7216d7946 100644
--- a/media-fonts/takao-fonts/Manifest
+++ b/media-fonts/takao-fonts/Manifest
@@ -1,6 +1,4 @@
 AUX 66-takao-fonts.conf 956 BLAKE2B 30f0a5b12eb4ad1b5b7d27d95e9cc4d56daf0bba7d4de80f2885b573dfa4a8f6516798cc54dc09fa904ec87992526d2eb6decf032d79532f45f293bfd7b85eca SHA512 78b83b1381b60ad3a69b7fc072c63ea4b0010e9ed534de8e683fbd1724a38b009a8e89e3cdec7ee48aae984b02024e7dea307854f4b8ca859078b43a6ec582f5
 DIST TakaoFonts_00303.01.tar.xz 11296836 BLAKE2B 560441d323a68c17b9ab083f336089359f633e4ffb1a17b12dfeaed06ea5e13b5372719e8a10269516392e9baa24ecfcf6227f215e29331da40d5a9d34ee136f SHA512 376385586a9589842ec15265f648d8ba0ffdf73af98248d1dad59bec537bc03485ff64538b547c698e8763e3058e6d976c8ea5839d818a2b375d184836d40fd1
-DIST takao-fonts-ttf-003.02.01.tar.gz 29678930 BLAKE2B 1e4589b091b8b367a3f7609fd3c1d0ed90df8c2d34e6e480f12c0fc67b5b3001969dc778204ffb1dccfe30f15d09496590024bc742ef90ba6150c9f2f82df00f SHA512 06d408f00066eaad72fe19796e3ebc3cfe17cd6a46c410bf4a4452ae14790c2d3dbf57cd628618fa738de10e6d581cabebe4dc7040c21bf8fc70c851b39e80d7
-EBUILD takao-fonts-003.02.01.ebuild 527 BLAKE2B 824b9fc36b3cc4bd9275a4a4e534aa02b3a5b97e3ee737e9e7bebbfff7eacea37d3893a2f2889175f404d7356cdda431843fb720cf7ba09ffe4cb3a35c3ac31c SHA512 9bfb231d996a6869db7570ffeb707084c4ffea197fa43946dad5d6b0333bf4eb0bcf125f353a46dba5845eb1c918cdbf240daa7533ce88889a55d7d18b245ba3
 EBUILD takao-fonts-00303.01.ebuild 535 BLAKE2B 91ec5415479571b50fdde77519e9e4aa42360de9377c2d58a27eca502ea98781072e3aaed232e2019df45dca21726732906e7353c15b7caf708d7a9e539b1d37 SHA512 f612656e44e31e25468612b94c9822475129acc7ddeff01f507b408f390c1c8b89e6d9aa9eb141a3f455c4a420fd3eb54186a50eb34224e6c1d0ebca74c22dd7
 MISC metadata.xml 437 BLAKE2B 439ddbaab55bf1a05657ea30a22d761d5f150b472b17aef1329cb8a751df2542b17330f0dd54baf81e59e84afba9cd414113588dc8bd57660cee6127852342d1 SHA512 401454618c35cff23ad769e6f11d1e64d2c37987e5a065f18083e0bbfb4098d95770e54afd9c757188d198e07f3b8cd12810e75496ce00ab010a8e4ddd1281a2
diff --git a/media-fonts/takao-fonts/takao-fonts-003.02.01.ebuild b/media-fonts/takao-fonts/takao-fonts-003.02.01.ebuild
deleted file mode 100644
index f457b05e987c..000000000000
--- a/media-fonts/takao-fonts/takao-fonts-003.02.01.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2010-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit font
-
-MY_P="${PN}-ttf-${PV}"
-
-DESCRIPTION="A community developed derivatives of IPA Fonts"
-HOMEPAGE="https://launchpad.net/takao-fonts"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${MY_P}.tar.gz"
-
-LICENSE="IPAfont"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~riscv x86"
-IUSE=""
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}/${MY_P}"
-
-FONT_CONF=( "${FILESDIR}/66-${PN}.conf" )
-FONT_SUFFIX="ttf"
diff --git a/media-fonts/unifont/Manifest b/media-fonts/unifont/Manifest
index 4f7694056341..41d2025d02fd 100644
--- a/media-fonts/unifont/Manifest
+++ b/media-fonts/unifont/Manifest
@@ -1,6 +1,3 @@
-AUX 11.0.02-make.patch 366 BLAKE2B 1d857d76826b5906c6405aa41728121624b345ad1f9bf2e8239691af1e5506dbad7eab1f590bf3bbfea45f174af0e8f8fa9d85b11542ea91edc218cdaa08d13b SHA512 f8a286c4ecd9af7ec32f2f90ba0ae91e2f9f4111cb1f65dbc4cef07dff787eae4ee96aca7e15a61d2ae8930f3537dd6fa77393dc720a4fc91300a2c9a5c1d9ea
-DIST unifont-13.0.01.tar.gz 21053298 BLAKE2B 981d3d79015df9fa401823034de532840652127bc881d13244243dc0fbaabc14212b006f1e72ff65233793c7064576b51855d6a8ab1f7d889e7837c9c22d4f5d SHA512 2987aa097f89b1287d126e44297b19e405e198bb8ede2e321e6452c60678ebf4cf0be5f059b9565f4584bad09801effabe64d01ab90f132f27b206174827b14b
 DIST unifont-14.0.03.tar.gz 27451330 BLAKE2B f0ae933fc493d7e724b0526968d63fb4209e28526346a835b918aa6a31cd1a31c15a0c00f89196f6fd42cf2a0b2db8c51d9b6f9d7648938609e8b7e4122078a3 SHA512 de80097a4e1751c6ca21775c8ffe19716a910a0d110749017eacaa50a9f8f02d80e0b402426f3c2309e64e129a0386e29015d1116ad5fd64f97e5dc7fb75bdce
-EBUILD unifont-13.0.01-r1.ebuild 1111 BLAKE2B 17d328acc0c6743b1acd0291ffcc50c2d5391ef398a25301b36a8f986c932225b2843457642a5e620de879db94295ef731ab41df5c8aa537214d1212b0a20c5c SHA512 cf8f9891dcb04300198161a40fc2a3ffe9c7adfd7d5567e52d8ea9e1e80f3c843ef2cbc4452e454ee2e5844f6dd8bc1c7b5a13c7174c2541cdc1bbfca2c1a1e4
 EBUILD unifont-14.0.03.ebuild 1100 BLAKE2B 1f2d335c95d9bc65e58472a298f8d866838a1fb42f71fbd8b77c265c78c9590c02958ed36c44d3cfd50767b8940d344465588ccc49cf519cb728c1b2f67fa555 SHA512 2ce0d9c75766e4801899847df13dfac9c4ea7bf54c538a966b5c005e431db03a2392a57a0fed0e24318c44919781910b89b109382841828deadbc92d1160f974
 MISC metadata.xml 485 BLAKE2B 5547944f4afc22e78b218df90194a20fd7d3a2bf012d231a98d51e570be16bf1644890541dea1e3ddeab2ca6e621f62c26e23ebc18aaa7cf7118f4aec639260d SHA512 fbc4063b1076aaec7f62bec624dcab2b76ff170fbe9cf3abcbbd0aa64610472b39555df1a5a706589781684590b8eb465c7467446bed63d20a8ea0e8ae21ba8e
diff --git a/media-fonts/unifont/files/11.0.02-make.patch b/media-fonts/unifont/files/11.0.02-make.patch
deleted file mode 100644
index fa4e8aebb674..000000000000
--- a/media-fonts/unifont/files/11.0.02-make.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/font/Makefile
-+++ b/font/Makefile
-@@ -247,7 +247,7 @@
- # as a baseline.  Remove the Plane 1 Copyleft glyph from the Plane 0
- # set of hex files.
- #
--coverage:
-+coverage: hex
- 	grep -v "^01F12F" $(COMPILED_DIR)/unifont_csur_lower-$(VERSION).hex \
- 	   > $(COMPILED_DIR)/unifont_all-$(VERSION).hex
- 	sort plane0[1-E]/*.hex plane0Fcsur/*.hex | grep -v "^0020:" \
diff --git a/media-fonts/unifont/unifont-13.0.01-r1.ebuild b/media-fonts/unifont/unifont-13.0.01-r1.ebuild
deleted file mode 100644
index ef3c9f52318c..000000000000
--- a/media-fonts/unifont/unifont-13.0.01-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2003-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit font toolchain-funcs
-
-DESCRIPTION="GNU Unifont - a Pan-Unicode X11 bitmap iso10646 font"
-HOMEPAGE="http://unifoundry.com/"
-SRC_URI="mirror://gnu/${PN}/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="fontforge utils"
-
-BDEPEND="
-	fontforge? (
-		app-text/bdf2psf
-		dev-lang/perl
-		dev-perl/GD[png(+)]
-		media-gfx/fontforge
-		x11-apps/bdftopcf
-	)
-"
-RDEPEND="
-	utils? (
-		dev-lang/perl
-		dev-perl/GD[png(+)]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/11.0.02-make.patch
-)
-
-src_compile() {
-	buildargs=(
-		BUILDFONT=$(usex fontforge 1 '')
-		CC="$(tc-getCC)"
-		CFLAGS="${CFLAGS}"
-		INSTALL="${INSTALL-install}"
-	)
-	if use fontforge || use utils; then
-		emake "${buildargs[@]}"
-	fi
-}
-
-src_install() {
-	local installargs=(
-		COMPRESS=0
-		DESTDIR="${ED}"
-		PCFDEST="${ED}${FONTDIR}"
-		TTFDEST="${ED}${FONTDIR}"
-	)
-	use utils || installargs+=( -C font )
-	emake "${buildargs[@]}" "${installargs[@]}" install
-	font_xfont_config
-	font_fontconfig
-}
diff --git a/media-fonts/vlgothic/Manifest b/media-fonts/vlgothic/Manifest
index 8c81d0cf50d4..578970fe0da6 100644
--- a/media-fonts/vlgothic/Manifest
+++ b/media-fonts/vlgothic/Manifest
@@ -1,5 +1,3 @@
-DIST VLGothic-20141206.tar.bz2 4952134 BLAKE2B b650481bd63c71f996e584c60e612201d131c6f89a4b2d5843be30922ea05358add61cd6c5fe3205a1f81f5e79a049c284fa90092196d79f5c114d4a58205806 SHA512 70ef712398b48486c0494ca52c97e145ebbaae0988b535a5447c796ed668944c0700175ab80587e0226d507d1589cedfe733f10f47f9b024873cf9e5d4e7983d
 DIST VLGothic-20200720.tar.xz 2224932 BLAKE2B 97910117cb9d6b22a9711b132c77c403b242465d40afb2812aa1792c26527c30d1c00f7d2f9c379efe648cc6fb0b2adda351483a0508c88548cdce0e313c51f2 SHA512 d106f769843752e5d4841c73b56a947feefdc11739d8643a0e51d61b9b7450edf0ac7aa28edde63cb43ba5ebd9d438a9d544e24c770634ba94d1648c7b44d1de
-EBUILD vlgothic-20141206.ebuild 560 BLAKE2B 42ef4b9d1664591ad0d6e6b7afcdf2af0c67efedc8d2a7871b8bbacd2619348553d38a88cc4f64f38c6c092736b482b9c2d9be87f461a0fa6ff27593f6fc88c3 SHA512 f7f3170c690d2e7e1198b215fab49660312389be3609040dc69697b2b43dfbc4ae03e7b0c0a52523048b43c0a62d090ebba5337a85ee3ff69a074e72ca182893
-EBUILD vlgothic-20200720.ebuild 574 BLAKE2B 2a62947bd7b4fbcba99c1dffa7848337855ded20e77d3957beb45a1cea378facb65ba480f9346be1cf995026691ed0b3444722d4625cd8e685db0a6e86c33bec SHA512 24fd1cc98838ecd11489a498704f65617ad26a09c81a1b63ed66d96b758a04903447a75deebd66911d85ea5a00b7a0b14fbd71b7330f76a25d56a17a721ff641
+EBUILD vlgothic-20200720.ebuild 573 BLAKE2B db56d0dc1d77a161f6c4acb7a059fc9efcaf0c5e3434880a0fba908a20e0074497e0622959fd4eb60453128a395bafa8adeae29f9db74858efb3fbcbc14c10b1 SHA512 c1520a5674932a8f763ff22d19de00fb713b7b9649a0cb1e8c362085d72df9dd609d5fe98fbbc763c1004dd417ebb54e7c70f79c284857f71ddb94e6a6f35ed9
 MISC metadata.xml 429 BLAKE2B 51a2d31c7e19ba4501ccf5889667a0427b91439a69c794078c22506d2cd1cc9a74d562023498712791b25330a7bd15415e6d9fb299d41ddaf38413d045265c93 SHA512 e17f01566b6480b083c24e08ce8babd0df1cacef25315563435205fd8e65ff6e944e9740b03c17f581e32577a7fce206f0ce93e0598c1b89cd8c1918000771e9
diff --git a/media-fonts/vlgothic/vlgothic-20141206.ebuild b/media-fonts/vlgothic/vlgothic-20141206.ebuild
deleted file mode 100644
index f2daea50bc13..000000000000
--- a/media-fonts/vlgothic/vlgothic-20141206.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit font
-
-MY_PN="VLGothic"
-
-DESCRIPTION="Japanese TrueType font from Vine Linux"
-HOMEPAGE="http://vlgothic.dicey.org/"
-SRC_URI="mirror://sourceforge.jp/${PN}/62375/${MY_PN}-${PV}.tar.bz2"
-
-# M+ FONTS -> mplus-fonts
-# sazanami -> BSD-2
-LICENSE="vlgothic mplus-fonts BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}/${MY_PN}"
-
-DOCS="Changelog README*"
-
-FONT_SUFFIX="ttf"
diff --git a/media-fonts/vlgothic/vlgothic-20200720.ebuild b/media-fonts/vlgothic/vlgothic-20200720.ebuild
index 31ff6994143b..beb669a1f07b 100644
--- a/media-fonts/vlgothic/vlgothic-20200720.ebuild
+++ b/media-fonts/vlgothic/vlgothic-20200720.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/73361/${MY_PN}-${PV}.tar.xz"
 # sazanami -> BSD-2
 LICENSE="vlgothic mplus-fonts BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~loong ~ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
 IUSE=""
 RESTRICT="binchecks strip"
 
diff --git a/media-fonts/vollkorn/Manifest b/media-fonts/vollkorn/Manifest
index e60a1ee2e2d7..9002e257b0d8 100644
--- a/media-fonts/vollkorn/Manifest
+++ b/media-fonts/vollkorn/Manifest
@@ -1,5 +1,3 @@
-DIST Vollkorn-2.1.zip 139737 BLAKE2B 5aa31eb1b7e493b273e7623eb22d99b629f5c044ae1ff594cb48d488cf800114a4fc4884c02e7e9400bcaa4d6b6d344283e7a2de885f9c95dd33beba690ae7d9 SHA512 f6d3283a06204491119ce3a3796dace7db640469192b9d44fd44471a185dc580a2ba8160f2983371b6160cb782adaabcd02872cfc2b1d05b10f3d6e73c60cded
 DIST vollkorn-4-105.zip 11046213 BLAKE2B bfa8515335ab6f7eaa57ad03642b7694b41047b228e9c1c51285ac70f8d799a9d61ba0414bc91ec1fdb5e579597a8a3d5c901c1d77d1de1c425ba1822a29ced9 SHA512 847196951f842481d11d76304435f88190608cabd7ccb47ca19a10b7215b69e19c19dc85e628e6b2730dd9b8cf1850c6b30470103724dd40fcf9b5eadb88a3f8
-EBUILD vollkorn-2.1.ebuild 585 BLAKE2B 89c5949980a023119609c1e8e0bc88f17513ac9127421e28543102657f791e2aae913e63f2cacd51cca7908ec2d791bfa8ce3199676ce0d7b0729e7028a81b12 SHA512 fdf0a207513aa5f143b28081b16a2ce1eb89784c3fa115ae1fbf44ba76a760aa0136088a6b951f9a02ca2668a25b90c3df783655bed3e0d9f99ab49aa073a9fe
 EBUILD vollkorn-4.105.ebuild 784 BLAKE2B 38da0d9d7d76ad3d95ee84e3928f4a0c9ae839e3c5e1bf4a1266f349f36140d060762016fd46ad0b1fc57811b74ec8c70c588f71a846d027888fe598d86579c4 SHA512 954bd5bf8ee943a1b30691b192da9cc66e567bea69d460c3d57ed1793e0228e0f4c6df435067b28236237c334b9e779958f09f439a35b3f7e9b4ab2c97d954df
 MISC metadata.xml 505 BLAKE2B a1f71405075575567e70566a92f1a3f90334f8bd717ac27a37b1592c579a4f73268c9b63718eabfc0b7cecde2e9613b0fb6434c81387f26dbce790c16fa041f3 SHA512 b023c9f96fdc5cc2e25f648c6c7736008766331882ba7e4b15d2ad84088fe706a60aa1c976e6d53b3a1878951ec5a8ca5f075c7a9e8acba24064f29d2b7928c3
diff --git a/media-fonts/vollkorn/vollkorn-2.1.ebuild b/media-fonts/vollkorn/vollkorn-2.1.ebuild
deleted file mode 100644
index 2232c8303960..000000000000
--- a/media-fonts/vollkorn/vollkorn-2.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit font
-
-DESCRIPTION="Vollkorn, the free and healthy typeface for bread and butter use"
-HOMEPAGE="http://vollkorn-typeface.com/"
-SRC_URI="http://friedrichalthausen.de/Vollkorn-${PV}.zip"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-# Only installs fonts
-RESTRICT="strip binchecks"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-FONT_S="${S}"
-FONT_SUFFIX="ttf"
-DOCS="Fontlog.txt"
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 7ececc0cdf81..a61ad3f9e2dd 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index b38f6f28bb70..7158c0f305f6 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,16 +1,10 @@
 AUX fontconfig-2.10.2-docbook.patch 519 BLAKE2B dc2d348b3365c32d4a57cacc8f2060b57289983643918efb5244af691f16ad2c23fcb1eadb803367ef6ef22689b50238b071ff804ecc6dfc4ff63a9b95464d55 SHA512 a73cfbbd76bd74d6e222104104ce8e04b8dadf77ca01f886f0bdaa42eae1a200e2cc0e1437e9d0bc7c4827c925b7556af6f8708a24c47f2a6b2f493f2157f507
-AUX fontconfig-2.12.3-latin-update.patch 2049 BLAKE2B 5fdf036d307a09eaa3b475fc9b87d3c927e60f49deced429d41c46c9c677b5f90de12d7f82d55feadc003a8b841456c372084afe1ead3320cdf78d3e7bc474b1 SHA512 24520d40e7049d0fa5c05054dbe6d82149688d3e327b1818c6816bd3315de56969b040c88f8db0cbbf4f377d5ebf77199dbd3af5bc7bcae8bcaea69820d68ce6
-AUX fontconfig-2.13.1-proper_homedir.patch 7787 BLAKE2B 02aa34bbc32c528826a83947e854cbac6ad4d9b9b0669a7b313367786d58c829dbf8a8ba9e2489e93b2f5770da4c8d968cbcf8055f6d2b8c285dc68a8e254408 SHA512 15fead3db21726dfa26e66b767724c3ebd8fc2a961e32a5a306287563f67bf9768144cdbc1915d667772724a764116031b5e4ffc5b38d314915242e154fd8d45
-AUX fontconfig-2.13.1-revert_delete_.uuid_for_empty_directory.patch 1005 BLAKE2B 48d1ad733b7543a17f4917c81a7ca2df402f6fbc851d97edbb0d6e58d28446b532a9804db0af45eaf3b294158ad5377ed2dee95b2f66fe63b44312c39def5262 SHA512 b583cd21d11add33bc94ff624ba96ab8fe585beac2fa285b7b207bfdf199debe2496d8cf12ec406d84fcb46eaba4c9c5afd768002e2b35e0d569fc82d894947b
-AUX fontconfig-2.13.1-static_build.patch 2009 BLAKE2B 1aca47b31dbc3b606210dc37fd4a0c9e2629e7647676e24ceffe3f5b6eb2dab6406445ab47589f8f921e6698b65080e5a2b7e2a6cd0034a3d92dcbb74aeeabbd SHA512 32bb7b93d05875a3b8cc74110fbcc2d43f78008fcaea0c50fbb89e5f78b13067a19dab4d251c03945be42f202c9a950d7c9160bb6537cff0a57f55a92e7ad54b
 AUX fontconfig-2.13.93-latin-update.patch 1793 BLAKE2B 6d8bd13ee9eb4a5105fb6437e41681daaeb2bf0739326646ae3c78d60c49a1137ce9d62087e3fcc042398840fd5957ca93b1da37886ad6e2f9829f9fa810dbdc SHA512 cee297048df1a116af0416dd81ccd221cf9e24be2b828b4ba9a92f96dd9951ff13d627166740a88b0d0d3f1fced1eece2b8495ed30d463702ce326e02a29851d
 AUX fontconfig-2.14.0-docbook.patch 991 BLAKE2B 1c4b3336e88c6beb33d456adcee1e97b8d542d8c5799cba6b9710a162a4fa342836a5acde62d7723a110f8777232a5f7aa1e4e1bd73bbb20bb5005b96ae1ec24 SHA512 c140c94b1c03dc091ed005928d2957239bb1738cf70b36b2401d3fcf94e7eab05cee686ad27a60b1299cccfbc11f463425fd97419fd01786e27cb7840e5620cc
 AUX fontconfig-2.14.0-latin-update.patch 1889 BLAKE2B 42a5faab884bb47e645a8ee6f052577bfd8f9becb4b3d0e22e28ee4ba9a03458dd54a4becf9e0e3c728f18db68f3a115be619469fee7dfb2a20e508ef320b14b SHA512 c96c6ba0b2ebf24d0669bb982672ac03b45e1413f68f50f2ad6556ef87014d3c42875d6094426e1b89e108b5f165a0040a3740fc37d94902224549e56bb3642a
 AUX fontconfig-2.14.0-skip-bubblewrap-tests.patch 408 BLAKE2B 911a87e91dcdf49088e9a684a9af753464211f18fd471989410a57363dd71b7cc0940c9a8e61095d901b4d7ee804536262ebc6afb1af3f470d8cd164d2fd2113 SHA512 8302a3ccf5918c8a4c3af3ab3601752c005c0361003281996eba469195127fab0e99c8d225dcb674a1bc198f2c15b982cce49c6bb3234307cf58e47c9206ff5a
-DIST fontconfig-2.13.1.tar.bz2 1723639 BLAKE2B 08b9a522a9d89bc5e5ed0f0898182359efb110f22b6b7010f6bdda0d6d516957ea74ebe0703d684d4724fd9f44a2eaf50d8329d4e0f4e45e79f50466d808b9e1 SHA512 f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100
 DIST fontconfig-2.13.93.tar.xz 1418288 BLAKE2B 2be273c21c16f9bb2dfe618177eaf2de48610a145d402ba53becc1c4c2d0417a9cd0ce969d4521ff00c8c71e4b1d65e4bf945da56e140434244b81e7e24ecb7a SHA512 1ba119ea3faba662e108df6fce22f242eb2b7c5ec087159ca0cb76944991b19563f744c181263343941c50547bc0c73c6437d5380df09b5029facaab80465b58
 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 6709 BLAKE2B 2ab916da0bd32598dd8f6218763040ffa852e662a7b93f4ec96c399e150bbff0e41c4bdd32c880116e21d6156a1dea9b549c839bcd8760679648934ba31c2467 SHA512 eb08a6d2148c3ea80ee6f79f4b8bcbcb1040958971fe6af212685f1e1bed824ca96c0dc89d14f1fd58f8ba04665d709fe577059e203c2f899374cdb2a14cbbad
 MISC metadata.xml 599 BLAKE2B c83a7da35bf49bd9bdbcc0adbeed83781250873abf67a927a63fbeb76c4013582cc2363068380b95cb021368bbc0ce92e4dc101f75eb6e3405f07a14d6dc97c3 SHA512 9cc70ac770d70ceef0a24acea4089a949456e229242a2f33f35230505cfa7dc5d20fbf1f2b066c6a1bae53013db6dbabbd22304a3f2a358ec43b6843b22e0a66
diff --git a/media-libs/fontconfig/files/fontconfig-2.12.3-latin-update.patch b/media-libs/fontconfig/files/fontconfig-2.12.3-latin-update.patch
deleted file mode 100644
index 397781e87acd..000000000000
--- a/media-libs/fontconfig/files/fontconfig-2.12.3-latin-update.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- fontconfig-2.12.3/conf.d/60-latin.conf
-+++ fontconfig-2.12.3/conf.d/60-latin.conf
-@@ -4,47 +4,50 @@
- 	<alias>
- 		<family>serif</family>
- 		<prefer>
--			<family>Bitstream Vera Serif</family>
-+			<family>Liberation Serif</family>
- 			<family>DejaVu Serif</family>
- 			<family>Times New Roman</family>
--			<family>Thorndale AMT</family>
- 			<family>Luxi Serif</family>
- 			<family>Nimbus Roman No9 L</family>
- 			<family>Nimbus Roman</family>
- 			<family>Times</family>
-+			<family>Thorndale AMT</family>
-+			<family>Bitstream Vera Serif</family>
- 		</prefer>
- 	</alias>
- 	<alias>
- 		<family>sans-serif</family>
- 		<prefer>
--			<family>Bitstream Vera Sans</family>
-+			<family>Liberation Sans</family>
- 			<family>DejaVu Sans</family>
--			<family>Verdana</family>
- 			<family>Arial</family>
--			<family>Albany AMT</family>
- 			<family>Luxi Sans</family>
- 			<family>Nimbus Sans L</family>
- 			<family>Nimbus Sans</family>
- 			<family>Helvetica</family>
- 			<family>Lucida Sans Unicode</family>
- 			<family>BPG Glaho International</family> <!-- lat,cyr,arab,geor -->
-+			<family>Verdana</family>
- 			<family>Tahoma</family> <!-- lat,cyr,greek,heb,arab,thai -->
-+			<family>Albany AMT</family>
-+			<family>Bitstream Vera Sans</family>
- 		</prefer>
- 	</alias>
- 	<alias>
- 		<family>monospace</family>
- 		<prefer>
--			<family>Bitstream Vera Sans Mono</family>
-+			<family>Liberation Mono</family>
- 			<family>DejaVu Sans Mono</family>
- 			<family>Inconsolata</family>
- 			<family>Andale Mono</family>
- 			<family>Courier New</family>
--			<family>Cumberland AMT</family>
- 			<family>Luxi Mono</family>
- 			<family>Nimbus Mono L</family>
- 			<family>Nimbus Mono</family>
- 			<family>Nimbus Mono PS</family>
- 			<family>Courier</family>
-+			<family>Cumberland AMT</family>
-+			<family>Bitstream Vera Sans Mono</family>
- 		</prefer>
- 	</alias>
- <!--
-@@ -65,6 +68,7 @@
- 	<alias>
- 		<family>cursive</family>
- 		<prefer>
-+			<family>Comic Neue</family>
- 			<family>ITC Zapf Chancery Std</family>
- 			<family>Zapfino</family>
- 			<family>Comic Sans MS</family>
diff --git a/media-libs/fontconfig/files/fontconfig-2.13.1-proper_homedir.patch b/media-libs/fontconfig/files/fontconfig-2.13.1-proper_homedir.patch
deleted file mode 100644
index 71c27f56f644..000000000000
--- a/media-libs/fontconfig/files/fontconfig-2.13.1-proper_homedir.patch
+++ /dev/null
@@ -1,313 +0,0 @@
-From 806fd4c2c5164d66d978b0a4c579c157e5cbe766 Mon Sep 17 00:00:00 2001
-From: Akira TAGOH <akira@tagoh.org>
-Date: Tue, 4 Sep 2018 09:08:37 +0000
-Subject: [PATCH] Fix the issue that '~' wasn't extracted to the proper homedir
-
-'~' in the filename was extracted to the home directory name in FcConfigFilename() though,
-this behavior was broken by d1f48f11. this change fixes it back to the correct behavior.
-
-https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/110
---- a/src/fccfg.c
-+++ b/src/fccfg.c
-@@ -2207,17 +2207,19 @@ FcConfigFilename (const FcChar8 *url)
- 	else
- 	    file = 0;
-     }
--
--    path = FcConfigGetPath ();
--    if (!path)
--	return NULL;
--    for (p = path; *p; p++)
-+    else
-     {
--	file = FcConfigFileExists (*p, url);
--	if (file)
--	    break;
-+	path = FcConfigGetPath ();
-+	if (!path)
-+	    return NULL;
-+	for (p = path; *p; p++)
-+	{
-+	    file = FcConfigFileExists (*p, url);
-+	    if (file)
-+		break;
-+	}
-+	FcConfigFreePath (path);
-     }
--    FcConfigFreePath (path);
-     return file;
- }
- 
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -91,6 +91,22 @@ test_bz106632_CFLAGS =					\
- test_bz106632_LDADD = $(top_builddir)/src/libfontconfig.la
- TESTS += test-bz106632
- 
-+if !ENABLE_SHARED
-+check_PROGRAMS += test-issue110
-+test_issue110_CFLAGS =					\
-+	-I$(top_builddir)				\
-+	-I$(top_builddir)/src				\
-+	-I$(top_srcdir)					\
-+	-I$(top_srcdir)/src				\
-+	-DHAVE_CONFIG_H					\
-+	-DFONTCONFIG_PATH='"$(BASECONFIGDIR)"'		\
-+	$(NULL)
-+test_issue110_LDADD =					\
-+	$(top_builddir)/src/libfontconfig.la		\
-+	$(NULL)
-+TESTS += test-issue110
-+endif
-+
- EXTRA_DIST=run-test.sh run-test-conf.sh $(TESTDATA) out.expected-long-family-names out.expected-no-long-family-names
- 
- CLEANFILES=out out1 out2 fonts.conf out.expected
---- /dev/null
-+++ b/test/test-issue110.c
-@@ -0,0 +1,245 @@
-+/*
-+ * fontconfig/test/test-issue110.c
-+ *
-+ * Copyright © 2000 Keith Packard
-+ * Copyright © 2018 Akira TAGOH
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation, and that the name of the author(s) not be used in
-+ * advertising or publicity pertaining to distribution of the software without
-+ * specific, written prior permission.  The authors make no
-+ * representations about the suitability of this software for any purpose.  It
-+ * is provided "as is" without express or implied warranty.
-+ *
-+ * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+ * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+ * PERFORMANCE OF THIS SOFTWARE.
-+ */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <dirent.h>
-+#include <unistd.h>
-+#include <errno.h>
-+#ifndef HAVE_STRUCT_DIRENT_D_TYPE
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#endif
-+#include <fontconfig/fontconfig.h>
-+
-+#ifdef _WIN32
-+#  define FC_DIR_SEPARATOR         '\\'
-+#  define FC_DIR_SEPARATOR_S       "\\"
-+#else
-+#  define FC_DIR_SEPARATOR         '/'
-+#  define FC_DIR_SEPARATOR_S       "/"
-+#endif
-+
-+extern FcChar8 *FcConfigRealFilename (FcConfig *, FcChar8 *);
-+
-+#ifdef HAVE_MKDTEMP
-+#define fc_mkdtemp	mkdtemp
-+#else
-+char *
-+fc_mkdtemp (char *template)
-+{
-+    if (!mktemp (template) || mkdir (template, 0700))
-+	return NULL;
-+
-+    return template;
-+}
-+#endif
-+
-+FcBool
-+mkdir_p (const char *dir)
-+{
-+    char *parent;
-+    FcBool ret;
-+
-+    if (strlen (dir) == 0)
-+	return FcFalse;
-+    parent = (char *) FcStrDirname ((const FcChar8 *) dir);
-+    if (!parent)
-+	return FcFalse;
-+    if (access (parent, F_OK) == 0)
-+	ret = mkdir (dir, 0755) == 0 && chmod (dir, 0755) == 0;
-+    else if (access (parent, F_OK) == -1)
-+	ret = mkdir_p (parent) && (mkdir (dir, 0755) == 0) && chmod (dir, 0755) == 0;
-+    else
-+	ret = FcFalse;
-+    free (parent);
-+
-+    return ret;
-+}
-+
-+FcBool
-+unlink_dirs (const char *dir)
-+{
-+    DIR *d = opendir (dir);
-+    struct dirent *e;
-+    size_t len = strlen (dir);
-+    char *n = NULL;
-+    FcBool ret = FcTrue;
-+#ifndef HAVE_STRUCT_DIRENT_D_TYPE
-+    struct stat statb;
-+#endif
-+
-+    if (!d)
-+	return FcFalse;
-+    while ((e = readdir (d)) != NULL)
-+    {
-+	size_t l;
-+
-+	if (strcmp (e->d_name, ".") == 0 ||
-+	    strcmp (e->d_name, "..") == 0)
-+	    continue;
-+	l = strlen (e->d_name) + 1;
-+	if (n)
-+	    free (n);
-+	n = malloc (l + len + 1);
-+	if (!n)
-+	{
-+	    ret = FcFalse;
-+	    break;
-+	}
-+	strcpy (n, dir);
-+	n[len] = FC_DIR_SEPARATOR;
-+	strcpy (&n[len + 1], e->d_name);
-+#ifdef HAVE_STRUCT_DIRENT_D_TYPE
-+	if (e->d_type == DT_DIR)
-+#else
-+	if (stat (n, &statb) == -1)
-+	{
-+	    fprintf (stderr, "E: %s\n", n);
-+	    ret = FcFalse;
-+	    break;
-+	}
-+	if (S_ISDIR (statb.st_mode))
-+#endif
-+	{
-+	    if (!unlink_dirs (n))
-+	    {
-+		fprintf (stderr, "E: %s\n", n);
-+		ret = FcFalse;
-+		break;
-+	    }
-+	}
-+	else
-+	{
-+	    if (unlink (n) == -1)
-+	    {
-+		fprintf (stderr, "E: %s\n", n);
-+		ret = FcFalse;
-+		break;
-+	    }
-+	}
-+    }
-+    if (n)
-+	free (n);
-+    closedir (d);
-+
-+    if (rmdir (dir) == -1)
-+    {
-+	fprintf (stderr, "E: %s\n", dir);
-+	return FcFalse;
-+    }
-+
-+    return ret;
-+}
-+
-+int
-+main(void)
-+{
-+    FcConfig *cfg = FcConfigCreate ();
-+    char *basedir, template[512] = "/tmp/fc110-XXXXXX";
-+    char *sysroot, systempl[512] = "/tmp/fc110-XXXXXX";
-+    FcChar8 *d = NULL;
-+    FcChar8 *ret = NULL;
-+    FcChar8 *s = NULL;
-+    FILE *fp;
-+    int retval = 0;
-+
-+    retval++;
-+    basedir = fc_mkdtemp (template);
-+    if (!basedir)
-+    {
-+	fprintf (stderr, "%s: %s\n", template, strerror (errno));
-+	goto bail;
-+    }
-+    retval++;
-+    sysroot = fc_mkdtemp (systempl);
-+    if (!sysroot)
-+    {
-+	fprintf (stderr, "%s: %s\n", systempl, strerror (errno));
-+	goto bail;
-+    }
-+    fprintf (stderr, "D: Creating %s\n", basedir);
-+    mkdir_p (basedir);
-+    setenv ("HOME", basedir, 1);
-+    retval++;
-+    s = FcStrBuildFilename (basedir, ".fonts.conf", NULL);
-+    if (!s)
-+	goto bail;
-+    retval++;
-+    fprintf (stderr, "D: Creating %s\n", s);
-+    if ((fp = fopen (s, "wb")) == NULL)
-+	goto bail;
-+    fprintf (fp, "%s", s);
-+    fclose (fp);
-+    retval++;
-+    fprintf (stderr, "D: Checking file path\n");
-+    ret = FcConfigRealFilename (cfg, "~/.fonts.conf");
-+    if (!ret)
-+	goto bail;
-+    retval++;
-+    if (strcmp ((const char *) s, (const char *) ret) != 0)
-+	goto bail;
-+    free (ret);
-+    free (s);
-+    setenv ("FONTCONFIG_SYSROOT", sysroot, 1);
-+    fprintf (stderr, "D: Creating %s\n", sysroot);
-+    mkdir_p (sysroot);
-+    retval++;
-+    d = FcStrBuildFilename (sysroot, basedir, NULL);
-+    fprintf (stderr, "D: Creating %s\n", d);
-+    mkdir_p (d);
-+    free (d);
-+    s = FcStrBuildFilename (sysroot, basedir, ".fonts.conf", NULL);
-+    if (!s)
-+	goto bail;
-+    retval++;
-+    fprintf (stderr, "D: Creating %s\n", s);
-+    if ((fp = fopen (s, "wb")) == NULL)
-+	goto bail;
-+    fprintf (fp, "%s", s);
-+    fclose (fp);
-+    retval++;
-+    fprintf (stderr, "D: Checking file path\n");
-+    ret = FcConfigRealFilename (cfg, "~/.fonts.conf");
-+    if (!ret)
-+	goto bail;
-+    retval++;
-+    if (strcmp ((const char *) s, (const char *) ret) != 0)
-+	goto bail;
-+    retval = 0;
-+bail:
-+    fprintf (stderr, "Cleaning up\n");
-+    unlink_dirs (basedir);
-+    if (ret)
-+	free (ret);
-+    if (s)
-+	free (s);
-+
-+    return retval;
-+}
-+
diff --git a/media-libs/fontconfig/files/fontconfig-2.13.1-revert_delete_.uuid_for_empty_directory.patch b/media-libs/fontconfig/files/fontconfig-2.13.1-revert_delete_.uuid_for_empty_directory.patch
deleted file mode 100644
index cd66082eedd8..000000000000
--- a/media-libs/fontconfig/files/fontconfig-2.13.1-revert_delete_.uuid_for_empty_directory.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/107
-
-Reversion of part of:
-https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/f5dd8512bdf9fd8e01c30ae36f593758b29385cf
-
---- /src/fcdir.c
-+++ /src/fcdir.c
-@@ -421,13 +421,6 @@
-     /* Not using existing cache file, construct new cache */
-     if (!cache)
- 	cache = FcDirCacheScan (dir, config);
--    if (cache)
--    {
--	FcFontSet *fs = FcCacheSet (cache);
--
--	if (cache->dirs_count == 0 && (!fs || fs->nfont == 0))
--	    FcDirCacheDeleteUUID (dir, config);
--    }
- 
-     return cache;
- }
---- /test/run-test.sh
-+++ /test/run-test.sh
-@@ -239,19 +239,4 @@
- 
- rm -rf $MyPWD/sysroot
- 
--dotest "deleting .uuid file on empty dir"
--prep
--cp $FONT1 $FONT2 $FONTDIR
--$FCCACHE $FONTDIR
--sleep 1
--rm -f $FONTDIR/*pcf
--$FCCACHE $FONTDIR
--rmdir $FONTDIR > /dev/null 2>&1
--if [ $? != 0 ]; then
--  echo "*** Test failed: $TEST"
--  echo "$FONTDIR isn't empty"
--  ls -al $FONTDIR
--  exit 1
--fi
--
- rm -rf $FONTDIR $CACHEFILE $CACHEDIR $FONTCONFIG_FILE out
diff --git a/media-libs/fontconfig/files/fontconfig-2.13.1-static_build.patch b/media-libs/fontconfig/files/fontconfig-2.13.1-static_build.patch
deleted file mode 100644
index d78317da0b3c..000000000000
--- a/media-libs/fontconfig/files/fontconfig-2.13.1-static_build.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 8208f99fa1676c42bfd8d74de3e9dac5366c150c Mon Sep 17 00:00:00 2001
-From: Akira TAGOH <akira@tagoh.org>
-Date: Mon, 3 Sep 2018 04:56:16 +0000
-Subject: [PATCH] Fix the build issue with --enable-static
-
-Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/109
---- a/fontconfig/fontconfig.h
-+++ b/fontconfig/fontconfig.h
-@@ -1076,6 +1076,10 @@ FcUtf16Len (const FcChar8   *string,
- 	    int		    *nchar,
- 	    int		    *wchar);
- 
-+FcPublic FcChar8 *
-+FcStrBuildFilename (const FcChar8 *path,
-+		    ...);
-+
- FcPublic FcChar8 *
- FcStrDirname (const FcChar8 *file);
- 
---- a/src/fcint.h
-+++ b/src/fcint.h
-@@ -1282,10 +1282,6 @@ FcStrUsesHome (const FcChar8 *s);
- FcPrivate FcBool
- FcStrIsAbsoluteFilename (const FcChar8 *s);
- 
--FcPrivate FcChar8 *
--FcStrBuildFilename (const FcChar8 *path,
--		    ...);
--
- FcPrivate FcChar8 *
- FcStrLastSlash (const FcChar8  *path);
- 
---- a/test/test-bz106632.c
-+++ b/test/test-bz106632.c
-@@ -25,25 +25,26 @@
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
-+#include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <dirent.h>
-+#include <unistd.h>
-+#include <errno.h>
- #ifndef HAVE_STRUCT_DIRENT_D_TYPE
- #include <sys/types.h>
- #include <sys/stat.h>
--#include <unistd.h>
- #endif
--#include "fcstr.c"
--#undef FcConfigBuildFonts
--#undef FcConfigCreate
--#undef FcConfigGetCurrent
--#undef FcConfigParseAndLoadFromMemory
--#undef FcConfigUptoDate
--#undef FcFontList
--#undef FcInitReinitialize
--#undef FcPatternCreate
--#undef FcPatternDestroy
- #include <fontconfig/fontconfig.h>
- 
-+#ifdef _WIN32
-+#  define FC_DIR_SEPARATOR         '\\'
-+#  define FC_DIR_SEPARATOR_S       "\\"
-+#else
-+#  define FC_DIR_SEPARATOR         '/'
-+#  define FC_DIR_SEPARATOR_S       "/"
-+#endif
-+
- #ifdef HAVE_MKDTEMP
- #define fc_mkdtemp	mkdtemp
- #else
-@@ -154,18 +155,6 @@ unlink_dirs (const char *dir)
-     return ret;
- }
- 
--FcChar8 *
--FcLangNormalize (const FcChar8 *lang)
--{
--    return NULL;
--}
--
--FcChar8 *
--FcConfigHome (void)
--{
--    return NULL;
--}
--
- int
- main (void)
- {
diff --git a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
deleted file mode 100644
index b00c1b232b14..000000000000
--- a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal readme.gentoo-r1
-
-DESCRIPTION="A library for configuring and customizing font access"
-HOMEPAGE="https://fontconfig.org/"
-SRC_URI="https://fontconfig.org/release/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="1.0"
-[[ $(ver_cut 3) -ge 90 ]] || \
-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"
-IUSE="doc static-libs"
-
-# Test test-bz106632 is known to be broken, see bug #751232
-# and would require several backports. It will be fixed in
-# next version.
-# check-missing-doc is known to be broken, see bug #733608
-# because fontconfig-2.13.1-static_build.patch introduces a
-# function FcStrBuildFilename which is lacking documentation.
-# However, backporting isn't worth it. Will be fixed in
-# next version.
-RESTRICT="test"
-
-BDEPEND="dev-util/gperf
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	doc? (
-		=app-text/docbook-sgml-dtd-3.1*
-		app-text/docbook-sgml-utils[jadetex]
-	)"
-# Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
-# default and used by every distro.  See bug #283191.
-RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.9[${MULTILIB_USEDEP}]
-	!elibc_Darwin? ( !elibc_SunOS? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) )
-	elibc_Darwin? ( sys-libs/native-uuid )
-	elibc_SunOS? ( sys-libs/libuuid )
-	virtual/libintl[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-PDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig )
-	virtual/ttf-fonts"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.10.2-docbook.patch # 310157
-	"${FILESDIR}"/${PN}-2.12.3-latin-update.patch # 130466 + make liberation default
-	"${FILESDIR}"/${P}-revert_delete_.uuid_for_empty_directory.patch # 666418
-
-	# Patches from upstream (can usually be removed with next version bump)
-	"${FILESDIR}"/${P}-static_build.patch
-	"${FILESDIR}"/${P}-proper_homedir.patch
-)
-
-pkg_setup() {
-	DOC_CONTENTS="Please make fontconfig configuration changes using
-	\`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be
-	overwritten. If you need to reset your configuration to upstream defaults,
-	delete the directory ${EROOT}/etc/fonts/conf.d/ and re-emerge fontconfig."
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local addfonts
-	# harvest some font locations, such that users can benefit from the
-	# host OS's installed fonts
-	case ${CHOST} in
-		*-darwin*)
-			addfonts=",/Library/Fonts,/System/Library/Fonts"
-		;;
-		*-solaris*)
-			[[ -d /usr/X/lib/X11/fonts/TrueType ]] && \
-				addfonts=",/usr/X/lib/X11/fonts/TrueType"
-			[[ -d /usr/X/lib/X11/fonts/Type1 ]] && \
-				addfonts="${addfonts},/usr/X/lib/X11/fonts/Type1"
-		;;
-		*-linux-gnu)
-			use prefix && [[ -d /usr/share/fonts ]] && \
-				addfonts=",/usr/share/fonts"
-		;;
-	esac
-
-	local myeconfargs=(
-		$(use_enable doc docbook)
-		$(use_enable static-libs static)
-		--enable-docs
-		--localstatedir="${EPREFIX}"/var
-		--with-default-fonts="${EPREFIX}"/usr/share/fonts
-		--with-add-fonts="${EPREFIX}/usr/local/share/fonts${addfonts}"
-		--with-templatedir="${EPREFIX}"/etc/fonts/conf.avail
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )
-
-	default
-
-	# avoid calling this multiple times, bug #459210
-	if multilib_is_native_abi; then
-		# stuff installed from build-dir
-		emake -C doc DESTDIR="${D}" install-man
-
-		insinto /etc/fonts
-		doins fonts.conf
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name "*.la" -delete || die
-
-	# fc-lang directory contains language coverage datafiles
-	# which are needed to test the coverage of fonts.
-	insinto /usr/share/fc-lang
-	doins fc-lang/*.orth
-
-	dodoc doc/fontconfig-user.{txt,pdf}
-
-	if [[ -e ${ED}/usr/share/doc/fontconfig/ ]];  then
-		mv "${ED}"/usr/share/doc/fontconfig/* "${ED}"/usr/share/doc/${P} || die
-		rm -rf "${ED}"/usr/share/doc/fontconfig
-	fi
-
-	# Changes should be made to /etc/fonts/local.conf, and as we had
-	# too much problems with broken fonts.conf we force update it ...
-	echo 'CONFIG_PROTECT_MASK="/etc/fonts/fonts.conf"' > "${T}"/37fontconfig
-	doenvd "${T}"/37fontconfig
-
-	# As of fontconfig 2.7, everything sticks their noses in here.
-	dodir /etc/sandbox.d
-	echo 'SANDBOX_PREDICT="/var/cache/fontconfig"' > "${ED}"/etc/sandbox.d/37fontconfig
-
-	readme.gentoo_create_doc
-
-	keepdir /var/cache/${PN}
-}
-
-pkg_preinst() {
-	# Bug #193476
-	# /etc/fonts/conf.d/ contains symlinks to ../conf.avail/ to include various
-	# config files.  If we install as-is, we'll blow away user settings.
-	ebegin "Syncing fontconfig configuration to system"
-	if [[ -e ${EROOT}/etc/fonts/conf.d ]]; then
-		for file in "${EROOT}"/etc/fonts/conf.avail/*; do
-			f=${file##*/}
-			if [[ -L ${EROOT}/etc/fonts/conf.d/${f} ]]; then
-				[[ -f ${ED}/etc/fonts/conf.avail/${f} ]] \
-					&& ln -sf ../conf.avail/"${f}" "${ED}"/etc/fonts/conf.d/ &>/dev/null
-			else
-				[[ -f ${ED}/etc/fonts/conf.avail/${f} ]] \
-					&& rm "${ED}"/etc/fonts/conf.d/"${f}" &>/dev/null
-			fi
-		done
-	fi
-	eend $?
-}
-
-pkg_postinst() {
-	einfo "Cleaning broken symlinks in ${EROOT}/etc/fonts/conf.d/"
-	find -L "${EROOT}"/etc/fonts/conf.d/ -type l -delete
-
-	readme.gentoo_print_elog
-
-	if [[ -z ${ROOT} ]]; then
-		multilib_pkg_postinst() {
-			ebegin "Creating global font cache for ${ABI}"
-			"${EPREFIX}"/usr/bin/${CHOST}-fc-cache -srf
-			eend $?
-		}
-
-		multilib_parallel_foreach_abi multilib_pkg_postinst
-	fi
-}
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index 33f69244989e..99b04de49681 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -1,6 +1,5 @@
 AUX libepoxy-1.5.10-use-opengl.pc-without-x.patch 590 BLAKE2B cef810cccd2133045a60bb5d6e812f048402f1ad65b3befaca34b14950df60b5b7fa732de09eec1a998782ecf846d6863432713b62a29ee6b6ed25b1c2e1cd77 SHA512 567e3f838e62fb607e3cb4f15a5694ffe2407f575acfc1198b15f042fdaef333a05cd3dda28204fad8224967da13c62d87d2ea073c38f1f239d9e0ac7d520dd7
 DIST libepoxy-1.5.10.tar.gz 332078 BLAKE2B d56b45a8fc38901fdb23c50b569a667fce8ca289103a8d7ca19f96a76c75d3c2ff9d6959ed2ed47bd64806add95dafe42dc85dfc5bc60af14b5500b70070e008 SHA512 6786f31c6e2865e68a90eb912900a86bf56fd3df4d78a477356886ac3b6ef52ac887b9c7a77aa027525f868ae9e88b12e5927ba56069c2e115acd631fca3abee
 EBUILD libepoxy-1.5.10-r1.ebuild 1136 BLAKE2B 4cb6563ea7b2994fb7639b61b2b6731bca17ed97d1fe2f52d50c9debce8d89d2977cead9fee6059ae6efc9b60d82fb730782e171cb9a49398320e10d08232585 SHA512 84f241348b91dc9badb05747638bb5bc70ffbddd1df6f2ff1f4289549d2eff594ff6adb1fcab9ba9075de9326155f2a11bb73b074fd89e437f252aa62865ba9c
-EBUILD libepoxy-1.5.10.ebuild 1063 BLAKE2B e2cac5cdf0595fd42a33dedf9a04863839187903a36cfb2ea4c414ff0b656b90e73f73db5efcf0029dab2f71cc5f1c000ed75a712bc456ffc42fec9dca0370b5 SHA512 0e4ef5e9214a06e07c3b623f8050a4c8d0617017a1196eb9734e4855a2352650f9496b1f91fcfaf25c317493952c2a5945ab52a27ab1f8ae0a0c01f112de9352
 EBUILD libepoxy-9999.ebuild 1144 BLAKE2B 0b703da689f81eb822d90fc5d1e63f59101270890699cb092253d81960b43c6f0cde1227585738b2c63885cac34a58b95a0a04ded2183f193a1159df1617aa8e SHA512 3fc05fd42d2918abdc782c16367f2d6b7cb7a5884b66a6d93201a9e79742b78abda4bfe4bf5345e1265f0b6f1d5087430b0fc673fe54c44d2a3099f504385220
 MISC metadata.xml 376 BLAKE2B 980a035e0ac8a5a3126ee27c032e8f14353ca5e7f2920769b74a23aa827a1110ff8f55a49a1f3072889ea1fed9f76f39bb3c2fddc6f6e2e736773c961ea4be3b SHA512 d1b9e9349929118e39201157b34e7955b32301ceaea877025fdf929d1039af536618eec5a9b0c638622c390201cd4d3106d981f884cf0c1c6469534fa65797af
diff --git a/media-libs/libepoxy/libepoxy-1.5.10.ebuild b/media-libs/libepoxy/libepoxy-1.5.10.ebuild
deleted file mode 100644
index c5d061d1589a..000000000000
--- a/media-libs/libepoxy/libepoxy-1.5.10.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='xml(+)'
-inherit meson-multilib python-any-r1 virtualx
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/anholt/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-DESCRIPTION="Library for handling OpenGL function pointer management"
-HOMEPAGE="https://github.com/anholt/libepoxy"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+egl test +X"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	egl? ( media-libs/mesa[egl(+),${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )"
-BDEPEND="${PYTHON_DEPS}
-	virtual/pkgconfig"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Degl=$(usex egl)
-		-Dglx=$(usex X)
-		$(meson_use X x11)
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	virtx meson_src_test
-}
diff --git a/media-libs/libuninameslist/Manifest b/media-libs/libuninameslist/Manifest
index c4303041c7c5..e2d26ad08cb5 100644
--- a/media-libs/libuninameslist/Manifest
+++ b/media-libs/libuninameslist/Manifest
@@ -1,8 +1,4 @@
-AUX libuninameslist-20200413-makefile.patch 772 BLAKE2B bdb927053b364d9602dd8e3215f4bee166f331c9e996e465127ebcbab2c570251651154bd6e692de7b3da6679cc4e654a1f1779a7451a706b3d9fe29139398e8 SHA512 fbc3a3b30c89651a691db50f959edd7a18755b171b565900ab4631a8ac72588657dc1d00e83eb3d4c7116b6d629413160f5d6f6b64a4d375fedd7739e707f8f3
 AUX libuninameslist-20211114-slibtool.patch 2399 BLAKE2B bd5f8534506b55ce42f16e4d31ea9815d9e6408bff2c1649ebba119fb8e2dc90504e97ba59a4ab6b8dc49fcaaebfff5f0def923162e7f3bca4afb2c8d161ea7f SHA512 026a2dcda527433d33783317545b08a62cf89dba3429eb37871e796599e873feb9de56118dbb152befd86706c3286c004e1e61e3e3690586c2625af5e1f43c24
-DIST libuninameslist-dist-20200413.tar.gz 1210689 BLAKE2B 10577d930e4f1e2d8dc41d7df684b63897f62dae31d0bb2208b26ec9102ecc2fd0181d7d3d05c6c678de69b4f379805bfcbf0a484fd0076ff65ee2fa1e9d1368 SHA512 88befff4bf7efed149b4e3a5d58a733b2cb6477e103ec34529ff02a88f8c72a6fc9d7b0be9e97cd539a75c8ebe5e4127cdf03a568da2f219157174b9b585b2a3
 DIST libuninameslist-dist-20211114.tar.gz 1247578 BLAKE2B dd96a81c87e214b7b53549ecfcc0b79388a51218f3e6ecb64786d9acc4c540838e2679c4c0f634c94ca55271bb9f3a4350918bd0071c89dbebbd993758ab5314 SHA512 febd0fafe836a85148aa7ceb87888a5882e7c27968c20595026cd947e9e6c1d0246d6e585510377f0e561d36a194d129df302143c67f59dd3b82aa3d30190acb
-EBUILD libuninameslist-20200413-r1.ebuild 598 BLAKE2B 2c00a221fdb6ecab8f83450654b0c5cc189d318749002ae8cbdcd56bf4d646e8d8fde27a1cb52520559fe836ba67e6966c6ee22aaa059443a150bb73ab1de8ed SHA512 79e1882677b8ebb5986d7ec8cf632e63f487dfa141717688b10bf6d45cf6229507b636cefa3fd40343ef8b48ffd7cf0ee5188538a437b6a6d5d5994f92a6e564
-EBUILD libuninameslist-20200413-r2.ebuild 741 BLAKE2B 3b4c5a2d19c9efae026783e3ff68eb83660e64b8976fc8b66efa234d1bb6cd7c0304ec58abd0879dddcab7b7316b0c9fe4b06e04894fa73d1541c6122b01f18c SHA512 985afa82ae78c5ef099997c5ea1d848746d1d7075cc8f50dad1979ec7a6e12fec00684951a2574b6e688417d297aec6af475b5b89430eb633766a32931e2c726
-EBUILD libuninameslist-20211114.ebuild 725 BLAKE2B 4f7cd2fc1751c49259064cfe3b8e1f598fdbeabf9c436f21a011af5d279b82c97a3174733c9f885623eca7ef8273ffc930b21e48e6a7c2faf69ad31d6fd57453 SHA512 f1b7d2039a9327c68abcb9f51804df6e13cd0295470dd92e63ebcafd0e35d2dc14ce2606fce8d7c47047876b76b3116e89130a13917d4d2b61256700028efee2
+EBUILD libuninameslist-20211114.ebuild 724 BLAKE2B bdaeac23f3bd1123812fc741f1c5f21dd78cdab32bbc4fbf90404662ca8bf9a1ad60337cd873641810d1e84b3f014a2d0c3af958dada061e4faefc8c767046f5 SHA512 940c632aeae09d5d19eebd978a127716fa541a9eadee0a40a60f31fc743c56c64eb1be44485cbec5e97ca664ceea452ad7affa814bca7d21fe1bc824491c27fc
 MISC metadata.xml 484 BLAKE2B c5aae59be58a06431b5c19c32ac89ebc77a2ca93c37e98b834e9adf11e7c4a45e7655d21621929b70fac24cc4121f50dff17e462d1d782942215aaf5cffeabe2 SHA512 2bcc9f45999095ed409b6a77b66b827395371ae177c6496056936cff949339d192288b430ff631aea20ced5b107268afe63284919a3e90d0f335427910e18f7f
diff --git a/media-libs/libuninameslist/files/libuninameslist-20200413-makefile.patch b/media-libs/libuninameslist/files/libuninameslist-20200413-makefile.patch
deleted file mode 100644
index fc9c24329a4d..000000000000
--- a/media-libs/libuninameslist/files/libuninameslist-20200413-makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 98be02ca26c8..848bc6c8269b 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -44,6 +44,7 @@ lib_LTLIBRARIES += libuninameslist.la
- 
- include_HEADERS = uninameslist.h
- libuninameslist_la_LIBADD =
-+EXTRA_libuninameslist_la_DEPENDENCIES =
- man_MANS = libuninameslist.3
- noinst_HEADERS = nameslist-dll.h
- 
-@@ -53,6 +54,7 @@ libuninameslist_fr_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(FR_VERSION)
- libuninameslist_fr_la_SOURCES = nameslist-fr.c
- libuninameslist_fr_la.$(OBJEXT): uninameslist-fr.h nameslist-dll.h
- libuninameslist_la_LIBADD += -luninameslist-fr
-+EXTRA_libuninameslist_la_DEPENDENCIES += libuninameslist-fr.la
- man_MANS += libuninameslist-fr.3
- else
- EXTRA_DIST += nameslist-fr.c uninameslist-fr.h libuninameslist-fr.3
diff --git a/media-libs/libuninameslist/libuninameslist-20200413-r1.ebuild b/media-libs/libuninameslist/libuninameslist-20200413-r1.ebuild
deleted file mode 100644
index e09f527ea01e..000000000000
--- a/media-libs/libuninameslist/libuninameslist-20200413-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Library of unicode annotation data"
-HOMEPAGE="https://github.com/fontforge/libuninameslist"
-SRC_URI="https://github.com/fontforge/libuninameslist/releases/download/${PV}/${PN}-dist-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-	find "${ED}"/usr -name '*.la' -delete || die
-}
diff --git a/media-libs/libuninameslist/libuninameslist-20200413-r2.ebuild b/media-libs/libuninameslist/libuninameslist-20200413-r2.ebuild
deleted file mode 100644
index fce8a10ceeb4..000000000000
--- a/media-libs/libuninameslist/libuninameslist-20200413-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Library of unicode annotation data"
-HOMEPAGE="https://github.com/fontforge/libuninameslist"
-SRC_URI="https://github.com/fontforge/libuninameslist/releases/download/${PV}/${PN}-dist-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20200413-makefile.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-static --enable-frenchlib
-}
-
-src_install() {
-	default
-	find "${ED}"/usr -name '*.la' -delete || die
-}
diff --git a/media-libs/libuninameslist/libuninameslist-20211114.ebuild b/media-libs/libuninameslist/libuninameslist-20211114.ebuild
index 28ef586898ac..e9ff2a4432d3 100644
--- a/media-libs/libuninameslist/libuninameslist-20211114.ebuild
+++ b/media-libs/libuninameslist/libuninameslist-20211114.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fontforge/libuninameslist/releases/download/${PV}/${
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 PATCHES=(
 	"${FILESDIR}/${P}-slibtool.patch" # 792474
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index e843f5d624bf..47960b05028f 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,14 +1,6 @@
-DIST mesa-22.0.5.tar.xz 15777136 BLAKE2B 9622193bebea643a973e4ffa94b86aef1b2a9de0bc8d4c2d79ee07de3555353ae65d22237ae461f739dfe302647232847b9e044e7d4f3846c2c51e0c3be68839 SHA512 c73a4c3bfb41fef68e2ec1ccfd3df0a5af019c1e862af27d9bca27487dd4352dafeccd0dc0c3f15fadc54048573b9634261e4e969ae958c4f9fa88114131e910
-DIST mesa-22.1.2.tar.xz 15992280 BLAKE2B bb2929e6c7dd0384b8e58b2a0ab6f91eabec9b29b77349868ea737c2c8b8c0e33febb9836c6259601caa3ba4c6ab67f2c4df4d2677cdfab359bbce53d8df316f SHA512 2bcce3dcb6f151de7717153a0745c1c754dec7e63dae6923a2123d2149562f13ef8faaa0f15e54c434e80b0562932a8cf8be007d181777c82ccf7a1b1bb621cc
 DIST mesa-22.1.3.tar.xz 16016520 BLAKE2B 3f9838022914b4ecc8882bc648bdd99a81aab2c6ebd4d9a3ce74655d6ec718d09abc6424bdb4b84a5430dcc51113d67bfd3368af4a3f390d3c574733b8ade4b0 SHA512 e7348839eb37de89c90d21277a7cbb42ee673ad6c656177853f6d35db99556dbac29867712222342d902b4fa67df5687c9d543bad99c81bcd0ecfb7f08f37480
-DIST mesa-22.1.5.tar.xz 16072928 BLAKE2B c182af7855e3e04cdd7f7b25c1df62d13306c17f1973bb5b68eae3939a3cc640841bb37003f00f298033b666b7165c3e2639ff4bfa991123e165a73ac8cae203 SHA512 1aa72cd5b61635d489904944e5d80b1d923a38ffbd295341e6b30c492e469463bc4d0b63f74b071580572aec3a2cdfe19b3f2919ebc0fb4bcc35e114db925abc
-DIST mesa-22.1.6.tar.xz 16071404 BLAKE2B 2059aaedba4d74d5250a71a5a25ffb5a6b92314fb0bd2c8a99480459c79c6b7fcf93ee60a0d0baf9c198a3b00dd428060647a6c1a0534b73c6a66a8417bbeaa9 SHA512 3b2a0bb781c3d540401e6f51e3cf0d87d4e22923b6a5a4ea9d8ce5c79b4a2d5e8b1c237a36325d7d7178448ae102470ebefb312644dc09818cce91fd5439cb07
 DIST mesa-22.1.7.tar.xz 16109944 BLAKE2B 0d4724068eff0ad242e81808ff94b73e1b5da810d27706b5a594ad77875b54562db6d9f752b61bcfff773b26bbc64b751d4dd13cfa256106d3114377ea668d26 SHA512 447e87359445edce231761d94b316b2aa20e9ab58e4b59d75cbb1696dd0900e7164c32bebc3b75700b4070570b456f7a8cf0914181371754a52427d34e4b9120
-EBUILD mesa-22.0.5.ebuild 12064 BLAKE2B 51531f4eda83c55fc660e0e0af4ecd56dd27f3a63e4e9edd682c2b59dba3fc9b5d807ba83e58ba72027238c39a8230746aaa8e274181998233b76e0059d6a7b4 SHA512 e07146df6d58f19f336dd9f791d1216394c9ceec2a8d91c78c9948af5071e13bea02c856b8c1f6237595530b471b01640a1abfccbfc658edd7675e2578efca12
-EBUILD mesa-22.1.2.ebuild 12083 BLAKE2B 0098256a7a32c52540258dcc1d531a701ad531891d2f6f4ca2f4cf0c1cdc364c4a8fb6487a6b8f0b6efe46d6fd06ff951e194ae4d64ab0b51d58140d95d1ac93 SHA512 b1f9f47fc0cf720a7be0193c7c11e0ec63dd3408aa284690ced9b58761c94520961b2bcb2b00ec0cf7e2b0d66b0d41b77b886069fd605ab08cfc0cee8ed6c3a9
 EBUILD mesa-22.1.3.ebuild 12075 BLAKE2B fca03cd409af59496d249409f5b7484669e5226fc299da198b71c4d43d626a94006ebac18d2354593e0385e02e7f16514f3603fd96923b719489293856ab2e82 SHA512 cfa5cbf4dfdcdc9d00ba2bada8a3f7e7ecae704f92a0fe63b116f898023977e817c65554adb8d9973899e822eba6d24305e0eafb79f18fc2b38ae419b456c61a
-EBUILD mesa-22.1.5.ebuild 12043 BLAKE2B 2c84c59bb325ae48c615f4bcf9383b7e02436221bd1fd189753ca804a7c57a85c54ac99289f52d1fdd01170e17b3301488ad7ebd535f747bc57be86f57c6276d SHA512 d91bfae247e8cf49e0a1a0d4cf821955eef4c5094c595848adbad28ef6127251601e7ccdcef041a4986d8d097094710f530d2244d17a9ea930543e0f2dc4214f
-EBUILD mesa-22.1.6.ebuild 12043 BLAKE2B 2c84c59bb325ae48c615f4bcf9383b7e02436221bd1fd189753ca804a7c57a85c54ac99289f52d1fdd01170e17b3301488ad7ebd535f747bc57be86f57c6276d SHA512 d91bfae247e8cf49e0a1a0d4cf821955eef4c5094c595848adbad28ef6127251601e7ccdcef041a4986d8d097094710f530d2244d17a9ea930543e0f2dc4214f
 EBUILD mesa-22.1.7.ebuild 12043 BLAKE2B 2c84c59bb325ae48c615f4bcf9383b7e02436221bd1fd189753ca804a7c57a85c54ac99289f52d1fdd01170e17b3301488ad7ebd535f747bc57be86f57c6276d SHA512 d91bfae247e8cf49e0a1a0d4cf821955eef4c5094c595848adbad28ef6127251601e7ccdcef041a4986d8d097094710f530d2244d17a9ea930543e0f2dc4214f
 EBUILD mesa-9999.ebuild 12152 BLAKE2B c8c46b10699c28cc48a061f088aa99a24b1a943361a5ef794bad0a2575218d79b915c97e25da7a788fbba1553b389d70eb2d5acfd7890621c63c63318459fd3f SHA512 bebc380d05050a8cc072f28c96f008d4454d7614b56f371d6d6a389b4d30189ff84d11f7b1258932b83c6a7aaf21a7d44feb8e8b18b6ee0459620cd5594755bd
 MISC metadata.xml 1638 BLAKE2B 693f9dccb9933167cf5910541eff88b872bed49915574ffdf1776e430ef1e42f2a5a4aef5767a65927250a5e884c444fdf1340665a1f88105c1337ae8677dd59 SHA512 e304809d792e03ff480bd00f83358a6e33ad688cf45dd41fd5526a080bce6316148d838fc8d880f776501fb56524798a7e8a0a3b28105402ae3151ce7dda1909
diff --git a/media-libs/mesa/mesa-22.0.5.ebuild b/media-libs/mesa/mesa-22.0.5.ebuild
deleted file mode 100644
index 00c1f7f492c3..000000000000
--- a/media-libs/mesa/mesa-22.0.5.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="14"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:14[${MULTILIB_USEDEP}]
-		sys-devel/llvm:13[${MULTILIB_USEDEP}]
-		sys-devel/llvm:12[${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.1.2.ebuild b/media-libs/mesa/mesa-22.1.2.ebuild
deleted file mode 100644
index b0927a3c4385..000000000000
--- a/media-libs/mesa/mesa-22.1.2.ebuild
+++ /dev/null
@@ -1,461 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-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 ~loong ~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.110"
-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="14"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:14[${MULTILIB_USEDEP}]
-		sys-devel/llvm:13[${MULTILIB_USEDEP}]
-		sys-devel/llvm:12[${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() {
-	python_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.1.5.ebuild b/media-libs/mesa/mesa-22.1.5.ebuild
deleted file mode 100644
index 97c13b468175..000000000000
--- a/media-libs/mesa/mesa-22.1.5.ebuild
+++ /dev/null
@@ -1,460 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-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 ~loong ~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.110"
-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="14"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:14[${MULTILIB_USEDEP}]
-		sys-devel/llvm:13[${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() {
-	python_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.1.6.ebuild b/media-libs/mesa/mesa-22.1.6.ebuild
deleted file mode 100644
index 97c13b468175..000000000000
--- a/media-libs/mesa/mesa-22.1.6.ebuild
+++ /dev/null
@@ -1,460 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-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 ~loong ~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.110"
-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="14"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:14[${MULTILIB_USEDEP}]
-		sys-devel/llvm:13[${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() {
-	python_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/waffle/Manifest b/media-libs/waffle/Manifest
index 9c548dfa9d09..2d2cd8a9bcc8 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,5 +1,4 @@
 DIST waffle-v1.7.0.tar.bz2 302120 BLAKE2B 8ebfc78182ff86447d88d92edd6452dae28c1515de5f9639c402203bfb5a135bc493040941420161690a4812a202552266bceb89eee948d0c7aeae55d5b8d3d5 SHA512 ee7b8419e309387fa6d610174ba5dddda97525cef41c9600772b902eddfc4570e940437596d7fb50ee9dc2f5945e723236b61463975d2b9cc0faa150696d24c2
-EBUILD waffle-1.7.0-r1.ebuild 1617 BLAKE2B 76bfbd6a39f365c3e29631a7101322261e56cc3b284ba21b862dc1262009de1588a22be27941e69c74bb5a63a2ba9bb45f0bbc08c9988b7a6bc4f5b0446bfb68 SHA512 4f2c0f90cc06214379ef5a3d95fd352bbebae532c0fd005a3c06a05ded84b3f2905d53d9c2242b57b2fd8b1d05145b9520a738945348ee95c8f94504eca37d97
 EBUILD waffle-1.7.0-r2.ebuild 1606 BLAKE2B e986f97e87ca173d21babe3699a5d56e41aa78c4feb94d97fe7698af76bcdf6ac505f749a5d8c3084279f126d99af1facbdb5b32e19610bbbddd8bf9b21d1f2c SHA512 51caa025dc551ac3928158f477f1241b972b664edc90f5f9278ec67255a51857b347b3a4155cdfb35d72d4da3019d9b4b37b77ab6c0d2360d7572518ac4c1eb3
 EBUILD waffle-9999.ebuild 1609 BLAKE2B 75ed4e25c0946e27fe242c2780fad24798abee77a1a17d915dd39ee1ae427dbfef4b43a1cfea566a14175cb92c07e4583a373fdd40be949246bbe60031838598 SHA512 4342070b5f68bbb227f95a0d4ca6d23891a779255096a8e7150856c4a15e3a33e2bcc802ec741b0b88d937e6278131d920e6bf5fb05b480fdc94faf118b9c630
 MISC metadata.xml 417 BLAKE2B 93ea54a57c011a3488ec75dbb8b93bce0bd568dfc4438cf7c80b3c622513a9be4b3e809e9794646571f9f21afd1572d0b16915dbda35d7345d4ef6afcec4dca8 SHA512 1652ef53bd20fd9c526b77db60affc226920b007c1b1b2bbeb90c0606ae2d4e199cb352a3322e2953ae0b1472e671da516ea3c0fdfcc9aa26cc5a1c348590da6
diff --git a/media-libs/waffle/waffle-1.7.0-r1.ebuild b/media-libs/waffle/waffle-1.7.0-r1.ebuild
deleted file mode 100644
index 7b4d01d42f65..000000000000
--- a/media-libs/waffle/waffle-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}"
-	GIT_ECLASS="git-r3"
-else
-	SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
-	KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
-	S="${WORKDIR}"/${PN}-v${PV}
-fi
-inherit meson-multilib ${GIT_ECLASS}
-
-DESCRIPTION="Library that allows selection of GL API and of window system at runtime"
-HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="doc +egl +gbm wayland X"
-RESTRICT="test" # gl_basic tests don't work when run from portage
-
-RDEPEND="
-	>=media-libs/mesa-9.1.6[egl(+)?,gbm(+)?,${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-	)
-	gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	X? ( >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}] )
-"
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xml-dtd:4.2
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/wflinfo$(get_exeext)
-)
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_feature X glx)
-		$(meson_feature wayland)
-		$(meson_feature X x11_egl)
-		$(meson_feature gbm)
-		$(meson_feature egl surfaceless_egl)
-		$(meson_native_true build-manpages)
-		-Dbuild-tests=false
-	)
-	meson_src_configure
-}
-
-multilib_src_install() {
-	meson_src_install
-
-	! use doc && rm -rf \
-		"${D}"/usr/share/doc/waffle1 \
-		"${D}"/usr/share/man/man{3,7}
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 9f162ea300b1..88e9f8a11313 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 18fe2bcfc4dc..68c4c65979b2 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 18 Aug 2022 00:39:44 +0000
+Thu, 18 Aug 2022 06:39:42 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 3b0643443f62..46ed87052126 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 523682 BLAKE2B a866720fe3384cb354d689c52dc2eed547ab55e37608dcb637780fcc52106c8f5b1ad8a84b41fe53778860d6ace908fc8c4af0faa17e457054d95d23aee6e6b7 SHA512 8cd7653583d003af73b72c5887e3bbb7c5321dc87e14d08d6283a4c633685378b7922f0cd4552eeb523a7d2aca7c675e2fd4704a62d96cc574355d98d5158f89
-TIMESTAMP 2022-08-18T00:39:48Z
+TIMESTAMP 2022-08-18T06:39:45Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL9ilRfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL93rFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAkhg//YiE655GakJw95/W0WmOHgNv2NYzKNQX+hy7FsOkZFwWl9jmUZ3mz8xha
-gxtIBdSZ/0nmRdx+ybpQVudxILdW73j1nWFSGNG7u22s/tO/CG4V4D1x5uTGUXZl
-mCMFL3lHxcgcHrcIVZATOZl9yPCe3xl8xDypHb0Bop3AGGtDGC2SUJVSZYEe5p+g
-x8kzrVA6DtSNmofrADVeDdkqZHPXqL/qKQo0G5xGByBqTyb6+vZTYQ4B/Dypom5Y
-xU5lpPSAhcOVxnnjvk+xIqUs2oVTofCMlocNQ+dfXznVD4VyIcANNax2yEan+tI0
-eHENTxRPJNBtHHU7m1KK6rWV6Uioz9nle/iQ1jeicLestYD3/0xe9ZBD5Sm6cX4v
-qYsoWva5jn2t/eQOKRW3ibYwN13hzD+2q/tXlu4mTbbqB4dFLZ7IlllHxDOmyqr3
-0UkO2+AQKUrZyCfw1o1eJqhY/qWn7c5NEx4T705kYMeNey8J8KRaxhrktHXVXl9Q
-v+mijjLRtfOVHlEdBAuAl+QxZjKMso39YAtsuAZ9f/HsX1VaeISy/WId6ghfgd4x
-RZGa9icFOXYpyWvWD3tvrvNEsCpABDQLon+Su6/4J50skeicMmGgvylRUtRAOo2K
-YVUN2yFllEtIfi4pSxeUPWIa4cQMxi/HvGDfEDcxofSbqtXww2g=
-=r1Im
+klCvbRAAhWyYSTDPNe6dI5Aj2f0LxDugROb/jVUjwNyLbJBYPm8Lh/e9GSyQ5d1N
+lp2iwfL41HrN+XgaoWt7sMF2HsXBeYypgq+ja9noNja42BCkvB/UXt9q8wOb9scY
+m35MGhWsyUoY2bViaNsNTjcinSY8HXdAMxAo08AOJYPoJ2Dbzop4A7GXGdfgPnAV
+odjbH1VwTuI12JJ04IYrMVULqcDxUggmrIAoL6p4VubqCyo8Vzt87J0iEdN7xWcj
+Ain/R/Q1qhkrqet7o34xB2fS8TSgqvKOsEzsMcs1dSrW4VrqcMfLg39bEOWIDDLq
+xJRrKkZ+5USPRh1gt2eeqSN8FAcDlBRQwFWaiJN313++XsOjZ0k770Eugh30HrsY
+WAngfkiWLczOklhrrVJliNWL3iX/MBLg5qnikwCuqkkrKzKnOSOcNsL/S0wivkDS
+wStDN2yJ5NQN49jAqKoJhGvp/Frp3l4XXFB7D8GaTjGU3ktoQ5BFXjPikr5jUMr8
+mlHQ0VjbKGpMuKJQ2z2p+xvsptgNkGvrPLK/DUJ5Rm6sPPYQuUjYVDKRG4mck9LL
+/Zawj5DhqSq1pOz5kHRt99/WV2tk7YN1WyX3pde/EPjh7FRsuYj8klxfeqUpAXtv
+JJsWzYFsm2vZgzD1+G/svmJdyF/aeRszbXj9KuUVwRCwmRopde0=
+=PYAc
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 08b02ba847bb..68c4c65979b2 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 18 Aug 2022 00:39:45 +0000
+Thu, 18 Aug 2022 06:39:42 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 732303df8de9..c36601252957 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index 722a78475f8b..a9b72843ac58 100644
--- a/metadata/md5-cache/app-accessibility/Manifest.gz
+++ b/metadata/md5-cache/app-accessibility/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/emacspeak-56.0 b/metadata/md5-cache/app-accessibility/emacspeak-56.0
new file mode 100644
index 000000000000..4ab062fd60f0
--- /dev/null
+++ b/metadata/md5-cache/app-accessibility/emacspeak-56.0
@@ -0,0 +1,15 @@
+BDEPEND=>=app-editors/emacs-26.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=dev-lang/tcl:= espeak? ( app-accessibility/espeak-ng )
+DESCRIPTION=The emacspeak audio desktop
+EAPI=8
+HOMEPAGE=http://emacspeak.sourceforge.net/
+INHERIT=elisp toolchain-funcs readme.gentoo-r1
+IUSE=+espeak
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=BSD GPL-2
+RDEPEND=dev-lang/tcl:= espeak? ( app-accessibility/espeak-ng ) >=dev-tcltk/tclx-8.4 >=app-editors/emacs-26.1:*
+SLOT=0
+SRC_URI=https://github.com/tvraman/emacspeak/releases/download/56.0/emacspeak-56.0.tar.bz2
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=1598951a83c1907042a84b5a7c0e46fb
diff --git a/metadata/md5-cache/app-accessibility/emacspeak-9999 b/metadata/md5-cache/app-accessibility/emacspeak-9999
index 43cf8f625f52..447d48382126 100644
--- a/metadata/md5-cache/app-accessibility/emacspeak-9999
+++ b/metadata/md5-cache/app-accessibility/emacspeak-9999
@@ -1,12 +1,14 @@
+BDEPEND=>=app-editors/emacs-26.1:* >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=espeak? ( app-accessibility/espeak ) >=app-editors/emacs-24:* >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=the emacspeak audio desktop
-EAPI=6
+DEPEND=dev-lang/tcl:= espeak? ( app-accessibility/espeak-ng )
+DESCRIPTION=The emacspeak audio desktop
+EAPI=8
 HOMEPAGE=http://emacspeak.sourceforge.net/
+INHERIT=elisp toolchain-funcs readme.gentoo-r1 git-r3
 IUSE=+espeak
 LICENSE=BSD GPL-2
 PROPERTIES=live
-RDEPEND=espeak? ( app-accessibility/espeak ) >=dev-tcltk/tclx-8.4 >=app-editors/emacs-24:*
+RDEPEND=dev-lang/tcl:= espeak? ( app-accessibility/espeak-ng ) >=dev-tcltk/tclx-8.4 >=app-editors/emacs-26.1:*
 SLOT=0
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=bb5e081141fefe72f22d1d7405b36da5
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=1598951a83c1907042a84b5a7c0e46fb
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index c05fde272a18..f718873c1f0a 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/cabextract-1.8 b/metadata/md5-cache/app-arch/cabextract-1.8
deleted file mode 100644
index 6ad7205e23e1..000000000000
--- a/metadata/md5-cache/app-arch/cabextract-1.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Extracts files from Microsoft cabinet archive files
-EAPI=7
-HOMEPAGE=https://www.cabextract.org.uk/
-INHERIT=toolchain-funcs
-IUSE=extras
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=extras? ( dev-lang/perl )
-SLOT=0
-SRC_URI=https://www.cabextract.org.uk/cabextract-1.8.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a86efb3d74e6b4049d38be2b16ad39ca
diff --git a/metadata/md5-cache/app-arch/cabextract-1.9-r2 b/metadata/md5-cache/app-arch/cabextract-1.9-r2
deleted file mode 100644
index a63419c6ae76..000000000000
--- a/metadata/md5-cache/app-arch/cabextract-1.9-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-libs/libmspack-0.8_alpha:= virtual/pkgconfig
-DESCRIPTION=Extracts files from Microsoft cabinet archive files
-EAPI=7
-HOMEPAGE=https://www.cabextract.org.uk/
-INHERIT=autotools toolchain-funcs
-IUSE=extras
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~loong ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/libmspack-0.8_alpha:= extras? ( dev-lang/perl )
-SLOT=0
-SRC_URI=https://www.cabextract.org.uk/cabextract-1.9.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3a59265f757243511c04af4c31cef2dd
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index f5cac27a834c..aed068d158bc 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/qemu-7.0.0-r3 b/metadata/md5-cache/app-emulation/qemu-7.0.0-r3
index bfa35d01dfdc..e8fe55694540 100644
--- a/metadata/md5-cache/app-emulation/qemu-7.0.0-r3
+++ b/metadata/md5-cache/app-emulation/qemu-7.0.0-r3
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.qemu.org/qemu-7.0.0.tar.xz !doc? ( https://dev.gentoo.org/~sam/distfiles/app-emulation/qemu/qemu-7.0.0-docs.tar.xz )
 _eclasses_=fcaps	babe6282ea5c195981bd302af1adaf3a	linux-info	56708ddc53d8b607ed88fd97a56e59dc	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=628be76703e8b1c7d12f63103edfb219
+_md5_=f5e8af135b179d5e4a64f0bf0178ebbc
diff --git a/metadata/md5-cache/app-emulation/qemu-9999 b/metadata/md5-cache/app-emulation/qemu-9999
index d69d9d8dce57..ff101aeb6eea 100644
--- a/metadata/md5-cache/app-emulation/qemu-9999
+++ b/metadata/md5-cache/app-emulation/qemu-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=fcaps	babe6282ea5c195981bd302af1adaf3a	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	56708ddc53d8b607ed88fd97a56e59dc	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3237141634d699b2dcaf73a700b929d3
+_md5_=06cee24aa906f65eaceca3520d0c544f
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 49c26f80c457..3af00c3e5d0b 100644
--- a/metadata/md5-cache/app-eselect/Manifest.gz
+++ b/metadata/md5-cache/app-eselect/Manifest.gz
diff --git a/metadata/md5-cache/app-eselect/eselect-fontconfig-1.1-r1 b/metadata/md5-cache/app-eselect/eselect-fontconfig-1.1-r1
deleted file mode 100644
index b621c4f33201..000000000000
--- a/metadata/md5-cache/app-eselect/eselect-fontconfig-1.1-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=An eselect module to manage /etc/fonts/conf.d symlinks
-EAPI=7
-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
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.2.3 >=media-libs/fontconfig-2.4
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~sam/distfiles/app-eselect/eselect-fontconfig/fontconfig.eselect-1.1.bz2
-_md5_=1ffc688dd2d4a37d8ec6c854ab94a3ac
diff --git a/metadata/md5-cache/app-eselect/eselect-fontconfig-1.1-r2 b/metadata/md5-cache/app-eselect/eselect-fontconfig-1.1-r2
deleted file mode 100644
index c23ef2742ccf..000000000000
--- a/metadata/md5-cache/app-eselect/eselect-fontconfig-1.1-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-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
-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-1.1.bz2
-_md5_=783e7e064c0456c7237ff4949b41489b
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 1e46f01a2a0b..e4089495f3b3 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/dbskkd-cdb-2.00-r1 b/metadata/md5-cache/app-i18n/dbskkd-cdb-2.00-r1
deleted file mode 100644
index c111782b27a4..000000000000
--- a/metadata/md5-cache/app-i18n/dbskkd-cdb-2.00-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=|| ( dev-db/tinycdb dev-db/cdb )
-DESCRIPTION=SKK dictionary server based on cdb
-EAPI=7
-HOMEPAGE=https://github.com/jj1bdx/dbskkd-cdb
-INHERIT=flag-o-matic toolchain-funcs
-KEYWORDS=amd64 ppc x86
-LICENSE=BSD-2
-RDEPEND=acct-group/dbskkd acct-user/dbskkd app-i18n/skk-jisyo[cdb] sys-apps/xinetd
-SLOT=0
-SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/dbskkd-cdb/dbskkd-cdb-2.00.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5dcd4310ceded5fc1153292eae28075c
diff --git a/metadata/md5-cache/app-i18n/dbskkd-cdb-3.00-r1 b/metadata/md5-cache/app-i18n/dbskkd-cdb-3.00-r1
index 6663a59ca940..b8100bc89f0f 100644
--- a/metadata/md5-cache/app-i18n/dbskkd-cdb-3.00-r1
+++ b/metadata/md5-cache/app-i18n/dbskkd-cdb-3.00-r1
@@ -4,10 +4,10 @@ DESCRIPTION=SKK dictionary server based on cdb
 EAPI=7
 HOMEPAGE=https://github.com/jj1bdx/dbskkd-cdb
 INHERIT=flag-o-matic toolchain-funcs
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=MIT
 RDEPEND=acct-group/dbskkd acct-user/dbskkd app-i18n/skk-jisyo[cdb] sys-apps/xinetd
 SLOT=0
 SRC_URI=https://github.com/jj1bdx/dbskkd-cdb/archive/3.00.tar.gz -> dbskkd-cdb-3.00.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=3f29624eeb785c935723efee792b58e0
+_md5_=04aa6ccf35fd320d6219c420dbef182d
diff --git a/metadata/md5-cache/app-i18n/freewnn-1.1.1_alpha22-r1 b/metadata/md5-cache/app-i18n/freewnn-1.1.1_alpha22-r1
deleted file mode 100644
index 5973150d646b..000000000000
--- a/metadata/md5-cache/app-i18n/freewnn-1.1.1_alpha22-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=virtual/libcrypt:=
-DESCRIPTION=Network-Extensible Kana-to-Kanji Conversion System
-EAPI=6
-HOMEPAGE=http://freewnn.sourceforge.jp/ http://www.freewnn.org/
-IUSE=ipv6
-KEYWORDS=~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=virtual/libcrypt:=
-SLOT=0
-SRC_URI=mirror://sourceforge.jp/freewnn/59257/FreeWnn-1.1.1-a022.tar.bz2
-_md5_=0a184f66b1bb7913104789468a5462e8
diff --git a/metadata/md5-cache/app-i18n/freewnn-1.1.1_alpha23-r1 b/metadata/md5-cache/app-i18n/freewnn-1.1.1_alpha23-r1
index 20b569aa8e50..b7c0fc6cbd2e 100644
--- a/metadata/md5-cache/app-i18n/freewnn-1.1.1_alpha23-r1
+++ b/metadata/md5-cache/app-i18n/freewnn-1.1.1_alpha23-r1
@@ -5,10 +5,10 @@ EAPI=6
 HOMEPAGE=http://freewnn.sourceforge.jp/ http://www.freewnn.org/
 INHERIT=toolchain-funcs
 IUSE=ipv6 uum
-KEYWORDS=~alpha amd64 arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=virtual/libcrypt:= uum? ( sys-libs/ncurses:= )
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/freewnn/63271/FreeWnn-1.1.1-a023.tar.bz2
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f97efe7565260835a4c224223fb30c9c
+_md5_=0dd712b2784192b438f1afb89b5c1eb5
diff --git a/metadata/md5-cache/app-i18n/ibus-rime-1.4.0 b/metadata/md5-cache/app-i18n/ibus-rime-1.4.0
deleted file mode 100644
index 6171e03602de..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-rime-1.4.0
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-util/cmake virtual/pkgconfig
-DEFINED_PHASES=prepare
-DEPEND=app-i18n/ibus app-i18n/librime app-i18n/rime-data x11-libs/libnotify
-DESCRIPTION=Chinese Rime Input Method Engine for IBus
-EAPI=7
-HOMEPAGE=https://rime.im/ https://github.com/rime/ibus-rime
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-i18n/ibus app-i18n/librime app-i18n/rime-data x11-libs/libnotify
-SLOT=0
-SRC_URI=https://github.com/rime/ibus-rime/archive/1.4.0.tar.gz -> ibus-rime-1.4.0.tar.gz
-_md5_=fdeb474dca4c682714c87256f52582c6
diff --git a/metadata/md5-cache/app-i18n/im-chooser-1.7.0-r2 b/metadata/md5-cache/app-i18n/im-chooser-1.7.0-r2
deleted file mode 100644
index 0778f6938b13..000000000000
--- a/metadata/md5-cache/app-i18n/im-chooser-1.7.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/autoconf-archive sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=app-i18n/imsettings virtual/libintl x11-libs/gtk+:3 x11-libs/libSM xfce? ( xfce-base/libxfce4util )
-DESCRIPTION=Desktop Input Method configuration tool
-EAPI=8
-HOMEPAGE=https://pagure.io/im-chooser
-INHERIT=autotools xdg
-IUSE=xfce
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=app-i18n/imsettings virtual/libintl x11-libs/gtk+:3 x11-libs/libSM xfce? ( xfce-base/libxfce4util )
-SLOT=0
-SRC_URI=https://releases.pagure.org/im-chooser/im-chooser-1.7.0.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d5e3bcab0e13d7c71e1465dcd7568611
diff --git a/metadata/md5-cache/app-i18n/im-freewnn-0.0.2-r2 b/metadata/md5-cache/app-i18n/im-freewnn-0.0.2-r2
deleted file mode 100644
index d6f03984e464..000000000000
--- a/metadata/md5-cache/app-i18n/im-freewnn-0.0.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=app-i18n/freewnn x11-libs/gtk+:2 sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DESCRIPTION=Japanese FreeWnn input method module for GTK+2
-EAPI=6
-HOMEPAGE=http://bonobo.gnome.gr.jp/~nakai/immodule/
-INHERIT=autotools gnome2-utils prefix
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=app-i18n/freewnn x11-libs/gtk+:2
-SLOT=0
-SRC_URI=http://bonobo.gnome.gr.jp/~nakai/immodule/im-freewnn-0.0.2.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=17b2299a9001c01113e10562d6e8495e
diff --git a/metadata/md5-cache/app-i18n/imhangul-2.1.0-r1 b/metadata/md5-cache/app-i18n/imhangul-2.1.0-r1
deleted file mode 100644
index 9ae2aeb575a8..000000000000
--- a/metadata/md5-cache/app-i18n/imhangul-2.1.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=app-i18n/libhangul x11-libs/gtk+:2 virtual/libintl virtual/pkgconfig sys-devel/gettext
-DESCRIPTION=GTK+ 2 Hangul Input Modules
-EAPI=6
-HOMEPAGE=https://github.com/libhangul/imhangul
-INHERIT=gnome2-utils toolchain-funcs
-KEYWORDS=amd64 ppc x86
-LICENSE=LGPL-2.1
-RDEPEND=app-i18n/libhangul x11-libs/gtk+:2 virtual/libintl
-SLOT=0
-SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/imhangul/imhangul-2.1.0.tar.bz2
-_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7a6ad52f75ff87b1302341c734cc88c0
diff --git a/metadata/md5-cache/app-i18n/imhangul-2.1.1 b/metadata/md5-cache/app-i18n/imhangul-2.1.1
index d9f13e02f9f9..c612fdd7f9c2 100644
--- a/metadata/md5-cache/app-i18n/imhangul-2.1.1
+++ b/metadata/md5-cache/app-i18n/imhangul-2.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=GTK+ 2 Hangul Input Modules
 EAPI=6
 HOMEPAGE=https://github.com/libhangul/imhangul
 INHERIT=gnome2-utils toolchain-funcs
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=LGPL-2.1
 RDEPEND=app-i18n/libhangul x11-libs/gtk+:2 virtual/libintl
 SLOT=0
 SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/imhangul/imhangul-2.1.1.tar.bz2
 _eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=81279e95b63b7f8f89a52cba672323c6
+_md5_=764b636ed12f84bbeb80010d3b82518a
diff --git a/metadata/md5-cache/app-i18n/imsettings-1.7.2 b/metadata/md5-cache/app-i18n/imsettings-1.7.2
deleted file mode 100644
index 19121217b7bf..000000000000
--- a/metadata/md5-cache/app-i18n/imsettings-1.7.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/glib-utils dev-util/intltool sys-devel/autoconf-archive sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/glib:2 sys-apps/dbus virtual/libintl x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libgxim x11-libs/libnotify gconf? ( gnome-base/gconf ) introspection? ( dev-libs/gobject-introspection ) xfconf? ( xfce-base/xfconf )
-DESCRIPTION=Delivery framework for general Input Method configuration
-EAPI=8
-HOMEPAGE=https://tagoh.bitbucket.io/imsettings
-INHERIT=autotools
-IUSE=gconf qt5 +introspection xfconf
-KEYWORDS=amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/glib:2 sys-apps/dbus virtual/libintl x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libgxim x11-libs/libnotify gconf? ( gnome-base/gconf ) introspection? ( dev-libs/gobject-introspection ) xfconf? ( xfce-base/xfconf )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://bitbucket.org/tagoh/imsettings/downloads/imsettings-1.7.2.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d94a096dde9d3f4754cf3ac413ed7d8b
diff --git a/metadata/md5-cache/app-i18n/kakasi-2.3.4-r2 b/metadata/md5-cache/app-i18n/kakasi-2.3.4-r2
deleted file mode 100644
index ffd60f5bfc2f..000000000000
--- a/metadata/md5-cache/app-i18n/kakasi-2.3.4-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Converts Japanese text between kanji, kana, and romaji
-EAPI=7
-HOMEPAGE=http://kakasi.namazu.org/
-INHERIT=toolchain-funcs
-IUSE=static-libs
-KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=http://kakasi.namazu.org/stable/kakasi-2.3.4.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1aca94b2a9ae04d87e13c990d1e0ec46
diff --git a/metadata/md5-cache/app-i18n/kakasi-2.3.6 b/metadata/md5-cache/app-i18n/kakasi-2.3.6
index 737dbe352c68..128c7bf8d968 100644
--- a/metadata/md5-cache/app-i18n/kakasi-2.3.6
+++ b/metadata/md5-cache/app-i18n/kakasi-2.3.6
@@ -3,8 +3,8 @@ DESCRIPTION=Converts Japanese text between kanji, kana, and romaji
 EAPI=7
 HOMEPAGE=http://kakasi.namazu.org/
 IUSE=l10n_ja static-libs
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=http://kakasi.namazu.org/stable/kakasi-2.3.6.tar.gz
-_md5_=9eaadcdb65c0ae57aa1dc42be3173647
+_md5_=ecd01c8ad0be973d66224a900f8f74b0
diff --git a/metadata/md5-cache/app-i18n/libpinyin-2.3.0 b/metadata/md5-cache/app-i18n/libpinyin-2.3.0
deleted file mode 100644
index bbae8ed648e0..000000000000
--- a/metadata/md5-cache/app-i18n/libpinyin-2.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-libs/glib:2 sys-libs/db:=
-DESCRIPTION=Libraries for handling of Hanyu Pinyin and Zhuyin Fuhao
-EAPI=7
-HOMEPAGE=https://github.com/libpinyin/libpinyin https://sourceforge.net/projects/libpinyin/
-INHERIT=autotools
-KEYWORDS=amd64 ~arm64 ppc ppc64 x86
-LICENSE=GPL-3+
-RDEPEND=dev-libs/glib:2 sys-libs/db:=
-SLOT=0/13
-SRC_URI=https://github.com/libpinyin/libpinyin/archive/2.3.0.tar.gz -> libpinyin-2.3.0.tar.gz mirror://sourceforge/libpinyin/models/model17.text.tar.gz -> libpinyin-model17.text.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=40c5d976ab9479ec6638594db4359632
diff --git a/metadata/md5-cache/app-i18n/libpinyin-2.6.2 b/metadata/md5-cache/app-i18n/libpinyin-2.6.2
index c570f7303e07..889a170e08ea 100644
--- a/metadata/md5-cache/app-i18n/libpinyin-2.6.2
+++ b/metadata/md5-cache/app-i18n/libpinyin-2.6.2
@@ -5,10 +5,10 @@ DESCRIPTION=Libraries for handling of Hanyu Pinyin and Zhuyin Fuhao
 EAPI=8
 HOMEPAGE=https://github.com/libpinyin/libpinyin https://sourceforge.net/projects/libpinyin/
 INHERIT=autotools
-KEYWORDS=amd64 ~arm64 ~ppc ppc64 x86
+KEYWORDS=amd64 ~arm64 ppc ppc64 x86
 LICENSE=GPL-3+
 RDEPEND=dev-libs/glib:2 sys-libs/db:=
 SLOT=0/13
 SRC_URI=https://github.com/libpinyin/libpinyin/archive/2.6.2.tar.gz -> libpinyin-2.6.2.tar.gz mirror://sourceforge/libpinyin/models/model19.text.tar.gz -> libpinyin-model19.text.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e25dc6a5c3c7be31f59c621ecd6cd128
+_md5_=4e44822e00ce13d1c1c7b41d1f9609f7
diff --git a/metadata/md5-cache/app-i18n/libskk-1.0.5 b/metadata/md5-cache/app-i18n/libskk-1.0.5
deleted file mode 100644
index c2a1ac6f1b3b..000000000000
--- a/metadata/md5-cache/app-i18n/libskk-1.0.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/vala:0.56 dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 ) virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libgee:0.8 x11-libs/libxkbcommon introspection? ( dev-libs/gobject-introspection ) nls? ( virtual/libintl )
-DESCRIPTION=GObject-based library to deal with Japanese kana-to-kanji conversion method
-EAPI=7
-HOMEPAGE=https://github.com/ueno/libskk
-INHERIT=vala virtualx
-IUSE=+introspection nls static-libs test
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libgee:0.8 x11-libs/libxkbcommon introspection? ( dev-libs/gobject-introspection ) nls? ( virtual/libintl )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ueno/libskk/releases/download/1.0.5/libskk-1.0.5.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vala	1c07e7167d9ef851ad187f5f3f02d34d	virtualx	644887c82aefdf12001489391fca4f02	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=fa9c1063e0c70ab776cb55ddcbd5908f
diff --git a/metadata/md5-cache/app-i18n/nkf-2.1.4 b/metadata/md5-cache/app-i18n/nkf-2.1.4
deleted file mode 100644
index de2ee5e6b0b4..000000000000
--- a/metadata/md5-cache/app-i18n/nkf-2.1.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)?] ) ) dev-lang/perl
-DESCRIPTION=Network Kanji code conversion Filter with UTF-8/16 support
-EAPI=7
-HOMEPAGE=https://osdn.net/projects/nkf/
-INHERIT=distutils-r1 perl-module toolchain-funcs vcs-snapshot
-IUSE=perl python l10n_ja python_targets_python3_8
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=ZLIB python? ( BSD )
-RDEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)?] ) ) dev-lang/perl:=
-REQUIRED_USE=python? ( || ( python_targets_python3_8 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge.jp/nkf/64158/nkf-2.1.4.tar.gz python? ( https://github.com/fumiyas/python-nkf/archive/000915e115acac57a1fdbceb1e6361788af83a3d.tar.gz -> python-nkf-0.2.0_p20141211.tar.gz )
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
-_md5_=b3ad4d7fbf152d1aeff6cc626f252599
diff --git a/metadata/md5-cache/app-i18n/opencc-1.1.3 b/metadata/md5-cache/app-i18n/opencc-1.1.3
deleted file mode 100644
index c4fc8d790ecd..000000000000
--- a/metadata/md5-cache/app-i18n/opencc-1.1.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) doc? ( app-doc/doxygen ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-cpp/tclap dev-libs/darts dev-libs/marisa:0= dev-libs/rapidjson test? ( dev-cpp/gtest !hppa? ( !sparc? ( dev-cpp/benchmark ) ) )
-DESCRIPTION=Library for conversion between Traditional and Simplified Chinese characters
-EAPI=8
-HOMEPAGE=https://github.com/BYVoid/OpenCC
-INHERIT=cmake python-any-r1
-IUSE=doc test
-KEYWORDS=amd64 arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/marisa:0=
-RESTRICT=!test? ( test )
-SLOT=0/1.1
-SRC_URI=https://github.com/BYVoid/OpenCC/archive/ver.1.1.3.tar.gz -> opencc-1.1.3.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7d921dece30d4d8016beb17703e2ad2c
diff --git a/metadata/md5-cache/app-i18n/scim-input-pad-0.1.3 b/metadata/md5-cache/app-i18n/scim-input-pad-0.1.3
deleted file mode 100644
index 309c6b187a06..000000000000
--- a/metadata/md5-cache/app-i18n/scim-input-pad-0.1.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/intltool-0.33 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=app-i18n/scim-1.2.0 >=x11-libs/gtk+-2.6.0:2
-DESCRIPTION=Input pad for SCIM used to input symbols and special characters
-EAPI=7
-HOMEPAGE=http://www.scim-im.org/
-INHERIT=autotools
-IUSE=nls
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-i18n/scim-1.2.0 >=x11-libs/gtk+-2.6.0:2
-SLOT=0
-SRC_URI=mirror://sourceforge/scim/scim-input-pad-0.1.3.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=5f8d9b43b74dae4bcf3a6802b076eab9
diff --git a/metadata/md5-cache/app-i18n/skk-jisyo-201905 b/metadata/md5-cache/app-i18n/skk-jisyo-201905
deleted file mode 100644
index 905b5aa591cb..000000000000
--- a/metadata/md5-cache/app-i18n/skk-jisyo-201905
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=virtual/awk cdb? ( || ( dev-db/tinycdb dev-db/cdb ) )
-DESCRIPTION=Jisyo (dictionary) files for the SKK Japanese-input software
-EAPI=8
-HOMEPAGE=http://openlab.ring.gr.jp/skk/dic.html
-IUSE=cdb
-KEYWORDS=amd64 arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=GPL-2 freedist public-domain
-SLOT=0
-SRC_URI=mirror://gentoo/skk-jisyo-201905.tar.xz https://dev.gentoo.org/~hattya/distfiles/skk-jisyo-201905.tar.xz
-_md5_=4f726cea963fca544f533effdad19ff7
diff --git a/metadata/md5-cache/app-i18n/skk-jisyo-202005 b/metadata/md5-cache/app-i18n/skk-jisyo-202005
index 968267c320df..6cf9b868d4a8 100644
--- a/metadata/md5-cache/app-i18n/skk-jisyo-202005
+++ b/metadata/md5-cache/app-i18n/skk-jisyo-202005
@@ -4,8 +4,8 @@ DESCRIPTION=Jisyo (dictionary) files for the SKK Japanese-input software
 EAPI=8
 HOMEPAGE=http://openlab.ring.gr.jp/skk/dic.html
 IUSE=cdb
-KEYWORDS=amd64 arm ~hppa ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=amd64 arm ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=CC-BY-SA-3.0 GPL-2+ public-domain unicode
 SLOT=0
 SRC_URI=mirror://gentoo/skk-jisyo-202005.tar.xz https://dev.gentoo.org/~hattya/distfiles/skk-jisyo-202005.tar.xz
-_md5_=516a308f7b61a255884dbf1c91bbaf62
+_md5_=961a7ff422d26036b0feb544c77e85a7
diff --git a/metadata/md5-cache/app-i18n/skktools-1.3.3_p20170305 b/metadata/md5-cache/app-i18n/skktools-1.3.3_p20170305
deleted file mode 100644
index 0cca4a69663c..000000000000
--- a/metadata/md5-cache/app-i18n/skktools-1.3.3_p20170305
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm unpack
-DEPEND=dev-libs/glib:2 sys-libs/gdbm emacs? ( >=app-editors/emacs-23.1:* ) virtual/pkgconfig
-DESCRIPTION=SKK utilities to manage dictionaries
-EAPI=6
-HOMEPAGE=http://openlab.jp/skk/
-INHERIT=elisp-common vcs-snapshot
-IUSE=emacs
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 sys-libs/gdbm emacs? ( >=app-editors/emacs-23.1:* )
-SLOT=0
-SRC_URI=https://github.com/skk-dev/skktools/archive/e14d98e734d2fdff611385c7df65826e94d929db.tar.gz -> skktools-1.3.3_p20170305.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp-common	e7aaa047873789f549ea3df2f04b2145	eqawarn	c9847c43b3253a276ae2eabddedab3d7	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
-_md5_=e3c76444f48c10e4c9ef34a6107ea976
diff --git a/metadata/md5-cache/app-i18n/sunpinyin-data-20130220 b/metadata/md5-cache/app-i18n/sunpinyin-data-20130220
deleted file mode 100644
index aa6f7808240e..000000000000
--- a/metadata/md5-cache/app-i18n/sunpinyin-data-20130220
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND==app-i18n/sunpinyin-2.0.4*
-DESCRIPTION=Data sets for Sunpinyin
-EAPI=6
-HOMEPAGE=https://github.com/sunpinyin/open-gram
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=mirror://sourceforge/open-gram/dict.utf8-20130220.tar.bz2 mirror://sourceforge/open-gram/lm_sc.t3g.arpa-20121025.tar.bz2
-_md5_=e26fe08952941c24c3854514f1bcae97
diff --git a/metadata/md5-cache/app-i18n/sunpinyin-data-20140820 b/metadata/md5-cache/app-i18n/sunpinyin-data-20140820
index b5dca97ef913..c78d68330928 100644
--- a/metadata/md5-cache/app-i18n/sunpinyin-data-20140820
+++ b/metadata/md5-cache/app-i18n/sunpinyin-data-20140820
@@ -4,9 +4,9 @@ DESCRIPTION=Data sets for SunPinyin
 EAPI=7
 HOMEPAGE=https://github.com/sunpinyin/open-gram
 INHERIT=edo
-KEYWORDS=amd64 ~ppc ppc64 ~riscv x86
+KEYWORDS=amd64 ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/open-gram/dict.utf8-20131214.tar.bz2 mirror://sourceforge/open-gram/lm_sc.3gm.arpa-20140820.tar.bz2
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3
-_md5_=a952448dd5c4e1d20757c47749f3a03f
+_md5_=1dc74a78e671cb5441e38a3d25ed9d2e
diff --git a/metadata/md5-cache/app-i18n/uim-1.8.8-r2 b/metadata/md5-cache/app-i18n/uim-1.8.8-r2
deleted file mode 100644
index b125e148a21b..000000000000
--- a/metadata/md5-cache/app-i18n/uim-1.8.8-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt ) anthy? ( app-i18n/anthy ) curl? ( net-misc/curl ) eb? ( dev-libs/eb ) emacs? ( >=app-editors/emacs-23.1:* ) expat? ( dev-libs/expat ) gtk? ( x11-libs/gtk+:3 ) gtk2? ( x11-libs/gtk+:2 ) libedit? ( dev-libs/libedit ) libffi? ( dev-libs/libffi:= ) libnotify? ( x11-libs/libnotify ) m17n-lib? ( dev-libs/m17n-lib ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtx11extras:5 ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) X? ( x11-base/xorg-proto )
-DESCRIPTION=A multilingual input method framework
-EAPI=7
-HOMEPAGE=https://github.com/uim/uim
-INHERIT=autotools elisp-common flag-o-matic gnome2-utils qmake-utils
-IUSE=X +anthy curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft
-KEYWORDS=amd64 ~arm ~hppa ppc ppc64 x86
-LICENSE=BSD GPL-2 LGPL-2.1
-RDEPEND=X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt ) anthy? ( app-i18n/anthy ) curl? ( net-misc/curl ) eb? ( dev-libs/eb ) emacs? ( >=app-editors/emacs-23.1:* ) expat? ( dev-libs/expat ) gtk? ( x11-libs/gtk+:3 ) gtk2? ( x11-libs/gtk+:2 ) libedit? ( dev-libs/libedit ) libffi? ( dev-libs/libffi:= ) libnotify? ( x11-libs/libnotify ) m17n-lib? ( dev-libs/m17n-lib ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtx11extras:5 ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) !dev-scheme/sigscheme X? ( media-fonts/font-sony-misc l10n_ja? ( || ( media-fonts/font-jis-misc media-fonts/intlfonts ) ) l10n_ko? ( || ( media-fonts/font-daewoo-misc media-fonts/intlfonts ) ) l10n_zh-CN? ( || ( media-fonts/font-isas-misc media-fonts/intlfonts ) ) l10n_zh-TW? ( media-fonts/intlfonts ) )
-REQUIRED_USE=gtk? ( X ) gtk2? ( X ) qt5? ( X ) xft? ( X )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/uim/uim/releases/download/1.8.8/uim-1.8.8.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=185f71c13a5c325c18c7926b0d5d6148
diff --git a/metadata/md5-cache/app-i18n/uim-1.8.9_pre20210103 b/metadata/md5-cache/app-i18n/uim-1.8.9_pre20210103
deleted file mode 100644
index 8cd442ba98eb..000000000000
--- a/metadata/md5-cache/app-i18n/uim-1.8.9_pre20210103
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/intltool gnome-base/librsvg sys-devel/gettext virtual/pkgconfig kde? ( dev-util/cmake ) 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 prepare unpack
-DEPEND=X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt ) anthy? ( app-i18n/anthy ) curl? ( net-misc/curl ) eb? ( dev-libs/eb ) emacs? ( >=app-editors/emacs-23.1:* ) expat? ( dev-libs/expat ) gtk? ( x11-libs/gtk+:3 ) gtk2? ( x11-libs/gtk+:2 ) kde? ( kde-frameworks/plasma:5 ) libedit? ( dev-libs/libedit ) libffi? ( dev-libs/libffi:= ) libnotify? ( x11-libs/libnotify ) m17n-lib? ( dev-libs/m17n-lib ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtx11extras:5 ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) X? ( x11-base/xorg-proto )
-DESCRIPTION=A multilingual input method framework
-EAPI=7
-HOMEPAGE=https://github.com/uim/uim
-INHERIT=autotools elisp-common flag-o-matic gnome2-utils qmake-utils vcs-snapshot
-IUSE=X +anthy curl eb emacs expat libffi gtk gtk2 kde l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~x86
-LICENSE=BSD GPL-2 LGPL-2.1
-RDEPEND=X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt ) anthy? ( app-i18n/anthy ) curl? ( net-misc/curl ) eb? ( dev-libs/eb ) emacs? ( >=app-editors/emacs-23.1:* ) expat? ( dev-libs/expat ) gtk? ( x11-libs/gtk+:3 ) gtk2? ( x11-libs/gtk+:2 ) kde? ( kde-frameworks/plasma:5 ) libedit? ( dev-libs/libedit ) libffi? ( dev-libs/libffi:= ) libnotify? ( x11-libs/libnotify ) m17n-lib? ( dev-libs/m17n-lib ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtx11extras:5 ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) !dev-scheme/sigscheme X? ( media-fonts/font-sony-misc l10n_ja? ( || ( media-fonts/font-jis-misc media-fonts/intlfonts ) ) l10n_ko? ( || ( media-fonts/font-daewoo-misc media-fonts/intlfonts ) ) l10n_zh-CN? ( || ( media-fonts/font-isas-misc media-fonts/intlfonts ) ) l10n_zh-TW? ( media-fonts/intlfonts ) )
-REQUIRED_USE=gtk? ( X ) gtk2? ( X ) qt5? ( X ) xft? ( X )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/uim/uim/archive/d1ac9d9315ff8c57c713b502544fef9b3a83b3e5.tar.gz -> uim-1.8.9_pre20210103.tar.gz https://github.com/uim/sigscheme/releases/download/0.9.1/sigscheme-0.9.1.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=92366c06a8e16b002a7a266fa5865897
diff --git a/metadata/md5-cache/app-i18n/uim-1.8.9_pre20210103-r1 b/metadata/md5-cache/app-i18n/uim-1.8.9_pre20210103-r1
index a62fcb0daf2e..3b1e61e5382d 100644
--- a/metadata/md5-cache/app-i18n/uim-1.8.9_pre20210103-r1
+++ b/metadata/md5-cache/app-i18n/uim-1.8.9_pre20210103-r1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://github.com/uim/uim
 INHERIT=autotools elisp-common flag-o-matic gnome2-utils qmake-utils vcs-snapshot
 IUSE=X +anthy curl eb emacs expat libffi gtk gtk2 kde l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft
-KEYWORDS=amd64 ~arm ~hppa ~ppc ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm ~hppa ppc ppc64 ~riscv x86
 LICENSE=BSD GPL-2 LGPL-2.1
 RDEPEND=X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt ) anthy? ( app-i18n/anthy ) curl? ( net-misc/curl ) eb? ( dev-libs/eb ) emacs? ( >=app-editors/emacs-23.1:* ) expat? ( dev-libs/expat ) gtk? ( x11-libs/gtk+:3 ) gtk2? ( x11-libs/gtk+:2 ) kde? ( kde-frameworks/plasma:5 ) libedit? ( dev-libs/libedit ) libffi? ( dev-libs/libffi:= ) libnotify? ( x11-libs/libnotify ) m17n-lib? ( dev-libs/m17n-lib ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) !dev-scheme/sigscheme X? ( media-fonts/font-sony-misc l10n_ja? ( || ( media-fonts/font-jis-misc media-fonts/intlfonts ) ) l10n_ko? ( || ( media-fonts/font-daewoo-misc media-fonts/intlfonts ) ) l10n_zh-CN? ( || ( media-fonts/font-isas-misc media-fonts/intlfonts ) ) l10n_zh-TW? ( media-fonts/intlfonts ) )
 REQUIRED_USE=gtk? ( X ) gtk2? ( X ) qt5? ( X ) xft? ( X )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/uim/uim/archive/d1ac9d9315ff8c57c713b502544fef9b3a83b3e5.tar.gz -> uim-1.8.9_pre20210103.tar.gz https://github.com/uim/sigscheme/releases/download/0.9.1/sigscheme-0.9.1.tar.bz2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0e59b1386e503b707932e2b4ecbf3099
+_md5_=4a1e86628aec4f47978a90605eb33de9
diff --git a/metadata/md5-cache/app-i18n/unicode-cldr-37.0 b/metadata/md5-cache/app-i18n/unicode-cldr-37.0
deleted file mode 100644
index 70f2e05f5cd1..000000000000
--- a/metadata/md5-cache/app-i18n/unicode-cldr-37.0
+++ /dev/null
@@ -1,10 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Unicode Common Locale Data Repository
-EAPI=8
-HOMEPAGE=https://cldr.unicode.org/
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86
-LICENSE=unicode
-SLOT=0
-SRC_URI=https://unicode.org/Public/cldr/37/cldr-common-37.0.zip -> unicode-cldr-common-37.0.zip
-_md5_=9a4c87b141db471adf34907ead7010fc
diff --git a/metadata/md5-cache/app-i18n/unicode-cldr-40.0 b/metadata/md5-cache/app-i18n/unicode-cldr-40.0
index 32ab499057d0..03309f045ed3 100644
--- a/metadata/md5-cache/app-i18n/unicode-cldr-40.0
+++ b/metadata/md5-cache/app-i18n/unicode-cldr-40.0
@@ -3,8 +3,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Unicode Common Locale Data Repository
 EAPI=8
 HOMEPAGE=https://cldr.unicode.org/
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86
 LICENSE=unicode
 SLOT=0
 SRC_URI=https://unicode.org/Public/cldr/40/cldr-common-40.0.zip -> unicode-cldr-common-40.0.zip
-_md5_=f1225fdb3c7f5ce62a7acd381e0b50ff
+_md5_=31839b9126abaec61a54f4c8f2eed62b
diff --git a/metadata/md5-cache/app-i18n/unicode-data-12.0.0 b/metadata/md5-cache/app-i18n/unicode-data-12.0.0
deleted file mode 100644
index 4a3e4d50a231..000000000000
--- a/metadata/md5-cache/app-i18n/unicode-data-12.0.0
+++ /dev/null
@@ -1,10 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install unpack
-DESCRIPTION=Unicode data from unicode.org
-EAPI=7
-HOMEPAGE=http://www.unicode.org/ucd/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=unicode
-SLOT=0
-SRC_URI=http://www.unicode.org/Public/zipped/12.0.0/UCD.zip -> unicode-data-12.0.0-UCD.zip http://www.unicode.org/Public/zipped/12.0.0/Unihan.zip -> unicode-data-12.0.0-Unihan.zip
-_md5_=1d8133e8cf3ea0ec7157f49e29654009
diff --git a/metadata/md5-cache/app-i18n/unicode-data-12.1.0 b/metadata/md5-cache/app-i18n/unicode-data-12.1.0
deleted file mode 100644
index 6fb589010dcd..000000000000
--- a/metadata/md5-cache/app-i18n/unicode-data-12.1.0
+++ /dev/null
@@ -1,10 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install unpack
-DESCRIPTION=Unicode data from unicode.org
-EAPI=7
-HOMEPAGE=https://www.unicode.org/ucd/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=unicode
-SLOT=0
-SRC_URI=https://www.unicode.org/Public/zipped/12.1.0/UCD.zip -> unicode-data-12.1.0-UCD.zip https://www.unicode.org/Public/zipped/12.1.0/Unihan.zip -> unicode-data-12.1.0-Unihan.zip
-_md5_=40e4c40a88688729e6b9a302b969a185
diff --git a/metadata/md5-cache/app-i18n/unicode-data-13.0.0 b/metadata/md5-cache/app-i18n/unicode-data-13.0.0
deleted file mode 100644
index b758e28b0205..000000000000
--- a/metadata/md5-cache/app-i18n/unicode-data-13.0.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Unicode data from unicode.org
-EAPI=7
-HOMEPAGE=https://unicode.org/ucd/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=unicode
-SLOT=0
-SRC_URI=https://unicode.org/Public/zipped/13.0.0/UCD.zip -> unicode-data-13.0.0-UCD.zip https://unicode.org/Public/zipped/13.0.0/Unihan.zip -> unicode-data-13.0.0-Unihan.zip
-_md5_=b3b1085a1032b548ab8dabed0738ac14
diff --git a/metadata/md5-cache/app-i18n/unicode-emoji-13.0 b/metadata/md5-cache/app-i18n/unicode-emoji-13.0
deleted file mode 100644
index f1a2868f6c97..000000000000
--- a/metadata/md5-cache/app-i18n/unicode-emoji-13.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=UTS #51 Unicode Emoji
-EAPI=8
-HOMEPAGE=https://unicode.org/emoji/techindex.html
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86
-LICENSE=unicode
-SLOT=0
-SRC_URI=https://unicode.org/Public/emoji/13.0/emoji-sequences.txt -> unicode-emoji-sequences-13.0.txt https://unicode.org/Public/emoji/13.0/emoji-test.txt -> unicode-emoji-test-13.0.txt https://unicode.org/Public/emoji/13.0/emoji-zwj-sequences.txt -> unicode-emoji-zwj-sequences-13.0.txt https://unicode.org/Public/13.0.0/ucd/emoji/emoji-data.txt -> unicode-emoji-data-13.0.txt https://unicode.org/Public/13.0.0/ucd/emoji/emoji-variation-sequences.txt -> unicode-emoji-variation-sequences-13.0.txt
-_md5_=30b627369aa1f1f38e8e0902b5e8c20b
diff --git a/metadata/md5-cache/app-i18n/unicode-emoji-14.0 b/metadata/md5-cache/app-i18n/unicode-emoji-14.0
index 19cc33d7074d..d2f85f64bc56 100644
--- a/metadata/md5-cache/app-i18n/unicode-emoji-14.0
+++ b/metadata/md5-cache/app-i18n/unicode-emoji-14.0
@@ -2,8 +2,8 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=UTS #51 Unicode Emoji
 EAPI=8
 HOMEPAGE=https://unicode.org/emoji/techindex.html
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86
 LICENSE=unicode
 SLOT=0
 SRC_URI=https://unicode.org/Public/emoji/14.0/emoji-sequences.txt -> unicode-emoji-sequences-14.0.txt https://unicode.org/Public/emoji/14.0/emoji-test.txt -> unicode-emoji-test-14.0.txt https://unicode.org/Public/emoji/14.0/emoji-zwj-sequences.txt -> unicode-emoji-zwj-sequences-14.0.txt https://unicode.org/Public/14.0.0/ucd/emoji/emoji-data.txt -> unicode-emoji-data-14.0.txt https://unicode.org/Public/14.0.0/ucd/emoji/emoji-variation-sequences.txt -> unicode-emoji-variation-sequences-14.0.txt
-_md5_=a40e93d5dd05d8f6762f2da784634d8a
+_md5_=1564e6827560624d64c5d845cfc197ee
diff --git a/metadata/md5-cache/app-i18n/xvnkb-0.2.11 b/metadata/md5-cache/app-i18n/xvnkb-0.2.11
index 211b39c360ad..5cbf8522ce17 100644
--- a/metadata/md5-cache/app-i18n/xvnkb-0.2.11
+++ b/metadata/md5-cache/app-i18n/xvnkb-0.2.11
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://xvnkb.sourceforge.net/
 INHERIT=toolchain-funcs
 IUSE=spell xft
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2+
 RDEPEND=x11-libs/libX11:= xft? ( x11-libs/libXft:= )
 SLOT=0
 SRC_URI=http://xvnkb.sourceforge.net/xvnkb-0.2.11.tar.bz2
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f39329d8af1ef7a7e2f206456cea62f3
+_md5_=edc7921d6549481a9ba6c0b7212e41c6
diff --git a/metadata/md5-cache/app-i18n/xvnkb-0.2.9a-r1 b/metadata/md5-cache/app-i18n/xvnkb-0.2.9a-r1
deleted file mode 100644
index c3ea006351a1..000000000000
--- a/metadata/md5-cache/app-i18n/xvnkb-0.2.9a-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=xft? ( virtual/pkgconfig )
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=x11-libs/libX11:= xft? ( x11-libs/libXft:= ) x11-base/xorg-proto
-DESCRIPTION=Vietnamese input keyboard for X
-EAPI=7
-HOMEPAGE=http://xvnkb.sourceforge.net/
-INHERIT=toolchain-funcs
-IUSE=spell xft
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2+
-RDEPEND=x11-libs/libX11:= xft? ( x11-libs/libXft:= )
-SLOT=0
-SRC_URI=http://xvnkb.sourceforge.net/xvnkb-0.2.9a.tar.bz2
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8676dd16cc73cbbfcd5455f59f5fdebf
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 2573bf8aa485..82032b7f0b52 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/lesspipe-2.06 b/metadata/md5-cache/app-text/lesspipe-2.06
new file mode 100644
index 000000000000..0319ad1cbc9d
--- /dev/null
+++ b/metadata/md5-cache/app-text/lesspipe-2.06
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig test? ( app-editors/vim )
+DEFINED_PHASES=compile configure install preinst
+DESCRIPTION=A preprocessor for less
+EAPI=8
+HOMEPAGE=https://github.com/wofr06/lesspipe
+INHERIT=bash-completion-r1
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl
+RESTRICT=!test? ( test ) test
+SLOT=0
+SRC_URI=https://github.com/wofr06/lesspipe/archive/v2.06.tar.gz -> lesspipe-2.06.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=b69e653f6f9bb4e8a00b0d6617271071
diff --git a/metadata/md5-cache/app-text/lv-4.51-r4 b/metadata/md5-cache/app-text/lv-4.51-r4
deleted file mode 100644
index fc34519fc33c..000000000000
--- a/metadata/md5-cache/app-text/lv-4.51-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure prepare
-DEPEND=!app-editors/levee sys-libs/ncurses:0= dev-lang/perl sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DESCRIPTION=Powerful Multilingual File Viewer
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-INHERIT=autotools toolchain-funcs
-KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=!app-editors/levee sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=mirror://gentoo/lv451.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=79a970379df6fbf7b5a0fa2ab9805510
diff --git a/metadata/md5-cache/app-text/lv-4.51-r5 b/metadata/md5-cache/app-text/lv-4.51-r5
index db0eedf8033d..c45e0f9ee77a 100644
--- a/metadata/md5-cache/app-text/lv-4.51-r5
+++ b/metadata/md5-cache/app-text/lv-4.51-r5
@@ -5,10 +5,10 @@ DESCRIPTION=Powerful Multilingual File Viewer
 EAPI=8
 HOMEPAGE=https://github.com/ttdoda/lv
 INHERIT=autotools toolchain-funcs
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=!app-editors/levee sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://gentoo/lv451.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2ab6f55a29ac68a9a3f1668c4cdef1d3
+_md5_=c582cea3cfee683e151afbda4ba19110
diff --git a/metadata/md5-cache/app-text/xdvik-22.87.03-r3 b/metadata/md5-cache/app-text/xdvik-22.87.03-r3
deleted file mode 100644
index 766406df19b8..000000000000
--- a/metadata/md5-cache/app-text/xdvik-22.87.03-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=sys-devel/flex virtual/yacc virtual/pkgconfig >=media-libs/freetype-2.9.1-r2:2 x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXpm x11-libs/libXt emacs? ( >=app-editors/emacs-23.1:* ) motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) ) dev-libs/kpathsea:= sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DESCRIPTION=DVI previewer for X Window System
-EAPI=6
-HOMEPAGE=http://xdvi.sourceforge.net/
-INHERIT=autotools desktop elisp-common flag-o-matic toolchain-funcs xdg-utils
-IUSE=motif neXt Xaw3d emacs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=media-libs/freetype-2.9.1-r2:2 x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXpm x11-libs/libXt emacs? ( >=app-editors/emacs-23.1:* ) motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) ) dev-libs/kpathsea:= virtual/latex-base !<app-text/texlive-2007
-SLOT=0
-SRC_URI=mirror://sourceforge/xdvi/xdvik-22.87.03.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=75ae4b87a4a19c2df5df8969cf2f322b
diff --git a/metadata/md5-cache/app-text/xdvik-22.87.03-r4 b/metadata/md5-cache/app-text/xdvik-22.87.03-r4
index f90249a26544..afe865752e37 100644
--- a/metadata/md5-cache/app-text/xdvik-22.87.03-r4
+++ b/metadata/md5-cache/app-text/xdvik-22.87.03-r4
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://xdvi.sourceforge.net/
 INHERIT=autotools desktop elisp-common flag-o-matic toolchain-funcs xdg
 IUSE=motif neXt Xaw3d emacs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=media-libs/freetype-2.9.1-r2:2 x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXpm x11-libs/libXt emacs? ( >=app-editors/emacs-23.1:* ) motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) ) dev-libs/kpathsea:= virtual/latex-base !<app-text/texlive-2007
 SLOT=0
 SRC_URI=mirror://sourceforge/xdvi/xdvik-22.87.03.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	22952d8f27cac191d75529d4c38e6bfa	elisp-common	e7aaa047873789f549ea3df2f04b2145	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=bc9aa5b28d6bd18fedb51ea18a08f763
+_md5_=832460ca4aa60ca687ffc8b8574645be
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 4fe2aa46d909..5a5b4d9c76f7 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.17.3 b/metadata/md5-cache/dev-java/protobuf-java-3.17.3
deleted file mode 100644
index 43ff7385255e..000000000000
--- a/metadata/md5-cache/dev-java/protobuf-java-3.17.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=~dev-libs/protobuf-3.17.3 >=virtual/jdk-1.8:*
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Google's Protocol Buffers - Java bindings
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0/28
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.17.3.tar.gz -> protobuf-3.17.3.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=96a63f10c1b4d9a9eaa37a3a5bee43bb
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index ce474db4c49e..d1ece696f9d9 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/darts-0.32 b/metadata/md5-cache/dev-libs/darts-0.32
deleted file mode 100644
index 3c224313f7a2..000000000000
--- a/metadata/md5-cache/dev-libs/darts-0.32
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=zlib? ( sys-libs/zlib )
-DESCRIPTION=A C++ template library that implements Double-Array
-EAPI=7
-HOMEPAGE=http://chasen.org/~taku/software/darts/
-IUSE=zlib
-KEYWORDS=amd64 ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=|| ( BSD LGPL-2.1 )
-RDEPEND=zlib? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=http://chasen.org/~taku/software/darts/src/darts-0.32.tar.gz
-_md5_=9eb0815ed2bf8670c972fa536e165be3
diff --git a/metadata/md5-cache/dev-libs/liblouis-3.22.0 b/metadata/md5-cache/dev-libs/liblouis-3.22.0
new file mode 100644
index 000000000000..92e861780c1a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/liblouis-3.22.0
@@ -0,0 +1,17 @@
+BDEPEND=sys-apps/help2man python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-libs/libyaml )
+DEFINED_PHASES=compile configure install prepare
+DEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) )
+DESCRIPTION=An open-source braille translator and back-translator
+EAPI=8
+HOMEPAGE=https://github.com/liblouis/liblouis
+INHERIT=distutils-r1
+IUSE=python test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
+RESTRICT=!test? ( test )
+SLOT=0/20
+SRC_URI=https://github.com/liblouis/liblouis/releases/download/v3.22.0/liblouis-3.22.0.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=f91fa3c52461047e166949aa49187db6
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.10.0 b/metadata/md5-cache/dev-libs/libxml2-2.10.0
new file mode 100644
index 000000000000..a64a0c0a2ebd
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libxml2-2.10.0
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=>=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(-)?] 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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] ) ) readline? ( sys-libs/readline:= )
+DESCRIPTION=XML C parser and toolkit
+EAPI=8
+HOMEPAGE=http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2
+INHERIT=autotools flag-o-matic python-r1 multilib-minimal gnome.org
+IUSE=debug examples icu lzma +python readline static-libs test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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=MIT
+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(-)?] 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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] ) ) readline? ( sys-libs/readline:= )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
+RESTRICT=!test? ( test )
+SLOT=2
+SRC_URI=mirror://gnome/sources/libxml2/2.10/libxml2-2.10.0.tar.xz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz https://www.w3.org/XML/Test/xmlts20130923.tar.gz )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=0d1507f518ab5a35545988176753584b
diff --git a/metadata/md5-cache/dev-libs/libxml2-9999 b/metadata/md5-cache/dev-libs/libxml2-9999
index d186d543f74e..24a872d8968d 100644
--- a/metadata/md5-cache/dev-libs/libxml2-9999
+++ b/metadata/md5-cache/dev-libs/libxml2-9999
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz https://www.w3.org/XML/Test/xmlts20130923.tar.gz )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a77affc6e919d520db315f3eab357668
+_md5_=327d986218730302f8e24aa8ba3b2edb
diff --git a/metadata/md5-cache/dev-libs/libxslt-1.1.36 b/metadata/md5-cache/dev-libs/libxslt-1.1.36
new file mode 100644
index 000000000000..2da82310bcc6
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libxslt-1.1.36
@@ -0,0 +1,16 @@
+BDEPEND=>=virtual/pkgconfig-1 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 app-arch/xz-utils
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libxml2-2.9.11:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) )
+DESCRIPTION=XSLT libraries and tools
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/libxslt
+INHERIT=autotools python-r1 multilib-minimal gnome.org
+IUSE=crypt debug examples python static-libs python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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=MIT
+RDEPEND=>=dev-libs/libxml2-2.9.11:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
+SLOT=0
+SRC_URI=mirror://gnome/sources/libxslt/1.1/libxslt-1.1.36.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=19fe54dd83213772e46af8a0ae8ff216
diff --git a/metadata/md5-cache/dev-libs/libxslt-9999 b/metadata/md5-cache/dev-libs/libxslt-9999
index 9b84daf8f6b3..4b8c5d60998b 100644
--- a/metadata/md5-cache/dev-libs/libxslt-9999
+++ b/metadata/md5-cache/dev-libs/libxslt-9999
@@ -1,15 +1,15 @@
-BDEPEND=>=virtual/pkgconfig-1 >=app-portage/elt-patches-20170815 sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=virtual/pkgconfig-1 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 prepare test unpack
 DEPEND=>=dev-libs/libxml2-2.9.11:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) )
 DESCRIPTION=XSLT libraries and tools
-EAPI=7
+EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/libxslt
-INHERIT=libtool python-r1 multilib-minimal autotools git-r3
+INHERIT=python-r1 multilib-minimal autotools git-r3
 IUSE=crypt debug examples python static-libs python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=dev-libs/libxml2-2.9.11:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
 SLOT=0
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1d9cce3cf854baa3cabd7e4fce1a6aca
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=569d927903a5cfec4295fb0aabd2ffc9
diff --git a/metadata/md5-cache/dev-libs/onigmo-6.1.3 b/metadata/md5-cache/dev-libs/onigmo-6.1.3
deleted file mode 100644
index 65fe9e9d37ad..000000000000
--- a/metadata/md5-cache/dev-libs/onigmo-6.1.3
+++ /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 configure install prepare test
-DESCRIPTION=Onigmo is a regular expressions library forked from Oniguruma
-EAPI=7
-HOMEPAGE=https://github.com/k-takata/Onigmo
-INHERIT=autotools multilib-minimal
-IUSE=combination-explosion-check crnl-as-line-terminator 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=amd64 x86
-LICENSE=BSD-2
-SLOT=0/6
-SRC_URI=https://github.com/k-takata/Onigmo/releases/download/Onigmo-6.1.3/onigmo-6.1.3.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ccd23e36fb12fedac3bb5a5328e5967f
diff --git a/metadata/md5-cache/dev-libs/oniguruma-6.9.7.1 b/metadata/md5-cache/dev-libs/oniguruma-6.9.7.1
deleted file mode 100644
index 856e2b0f3cca..000000000000
--- a/metadata/md5-cache/dev-libs/oniguruma-6.9.7.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Regular expression library for different character encodings
-EAPI=7
-HOMEPAGE=https://github.com/kkos/oniguruma
-INHERIT=multilib-minimal
-IUSE=crnl-as-line-terminator static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
-LICENSE=BSD-2
-SLOT=0/5
-SRC_URI=https://github.com/kkos/oniguruma/releases/download/v6.9.7.1/onig-6.9.7.1.tar.gz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2f8e79de7a902b1b7229bc78909c44c8
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.17.3 b/metadata/md5-cache/dev-libs/protobuf-3.17.3
deleted file mode 100644
index d969b00c2621..000000000000
--- a/metadata/md5-cache/dev-libs/protobuf-3.17.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=emacs? ( app-editors/emacs:* ) 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 prepare test
-DEPEND=test? ( >=dev-cpp/gtest-1.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing structured data
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-INHERIT=autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
-IUSE=emacs examples static-libs test 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
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0/28
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.17.3.tar.gz -> protobuf-3.17.3.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7795acbf0ab715b0f1dfeb9c2571704e
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.19.1 b/metadata/md5-cache/dev-libs/protobuf-3.19.1
deleted file mode 100644
index 06b0d6ed8edd..000000000000
--- a/metadata/md5-cache/dev-libs/protobuf-3.19.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=emacs? ( app-editors/emacs:* ) 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 prepare test
-DEPEND=test? ( >=dev-cpp/gtest-1.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing structured data
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-INHERIT=autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
-IUSE=emacs examples static-libs test 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
-KEYWORDS=~alpha amd64 arm arm64 -hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0/30
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.19.1.tar.gz -> protobuf-3.19.1.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d6bf161a4f045e5eb6988d82ad519834
diff --git a/metadata/md5-cache/dev-libs/utfcpp-3.1.2 b/metadata/md5-cache/dev-libs/utfcpp-3.1.2
deleted file mode 100644
index 37019892f61e..000000000000
--- a/metadata/md5-cache/dev-libs/utfcpp-3.1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-cpp/gtest )
-DESCRIPTION=UTF-8 C++ library
-EAPI=7
-HOMEPAGE=https://github.com/nemtrif/utfcpp
-INHERIT=cmake
-IUSE=test
-KEYWORDS=amd64 ~arm arm64 ppc ppc64 sparc x86
-LICENSE=Boost-1.0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/nemtrif/utfcpp/archive/v3.1.2.tar.gz -> utfcpp-3.1.2.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=95463474af4cd1c9e06d6ef50c4f698d
diff --git a/metadata/md5-cache/dev-libs/wayland-1.20.0 b/metadata/md5-cache/dev-libs/wayland-1.20.0
deleted file mode 100644
index f6152fe9d66e..000000000000
--- a/metadata/md5-cache/dev-libs/wayland-1.20.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=~dev-util/wayland-scanner-1.20.0 virtual/pkgconfig doc? ( >=app-doc/doxygen-1.6[dot] app-text/xmlto >=media-gfx/graphviz-2.26.0 ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install 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(-)?] dev-libs/libxml2:= >=dev-libs/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Wayland protocol libraries
-EAPI=7
-HOMEPAGE=https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland
-INHERIT=meson-multilib
-IUSE=doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-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(-)?] dev-libs/libxml2:= >=dev-libs/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://wayland.freedesktop.org/releases/wayland-1.20.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=7dead6b8bde3004a1eebfb198d857352
diff --git a/metadata/md5-cache/dev-libs/wayland-protocols-1.25 b/metadata/md5-cache/dev-libs/wayland-protocols-1.25
deleted file mode 100644
index 8ff5e610b709..000000000000
--- a/metadata/md5-cache/dev-libs/wayland-protocols-1.25
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/wayland-scanner virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=test? ( dev-libs/wayland )
-DESCRIPTION=Wayland protocol files
-EAPI=7
-HOMEPAGE=https://wayland.freedesktop.org/
-INHERIT=meson
-IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://wayland.freedesktop.org/releases/wayland-protocols-1.25.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=15e00772af962a9222b4bfd9cc09a6e2
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 69febc6da545..3b9079bb091a 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/confuse-2.0.0 b/metadata/md5-cache/dev-python/confuse-2.0.0
index 8e33ffd1d54e..9fd4ff5da705 100644
--- a/metadata/md5-cache/dev-python/confuse-2.0.0
+++ b/metadata/md5-cache/dev-python/confuse-2.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/beetbox/confuse/ https://pypi.org/project/confuse/
 INHERIT=distutils-r1
 IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/beetbox/confuse/archive/v2.0.0.tar.gz -> confuse-2.0.0.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=88ac2e96d3ae483bb505afaede8090a8
+_md5_=35862812d3cef34aeb5fea3d15bfa240
diff --git a/metadata/md5-cache/dev-python/future-0.18.2-r1 b/metadata/md5-cache/dev-python/future-0.18.2-r1
deleted file mode 100644
index 5d18b5ff9412..000000000000
--- a/metadata/md5-cache/dev-python/future-0.18.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_targets_python3_8? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) test? ( >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.9_p1:0 >=dev-python/sphinx-4.5.0-r1[python_targets_pypy3(-)] dev-python/sphinx-bootstrap-theme[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Easy, clean, reliable Python 2/3 compatibility
-EAPI=7
-HOMEPAGE=https://python-future.org/
-INHERIT=distutils-r1
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/f/future/future-0.18.2.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=b5b960767787160dca3dfaef5ec41b32
diff --git a/metadata/md5-cache/dev-python/irc-20.0.0-r1 b/metadata/md5-cache/dev-python/irc-20.0.0-r1
deleted file mode 100644
index e55d98c85d7f..000000000000
--- a/metadata/md5-cache/dev-python/irc-20.0.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/setuptools_scm-3.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/jaraco-collections[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-functools-1.20[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-itertools-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jaraco-logging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jaraco-stream[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jaraco-text[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tempora-1.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=IRC client framework written in Python
-EAPI=8
-HOMEPAGE=https://github.com/jaraco/irc/ https://pypi.org/project/irc/
-INHERIT=distutils-r1
-IUSE=examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~riscv x86
-LICENSE=MIT
-RDEPEND=dev-python/jaraco-collections[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-functools-1.20[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-itertools-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jaraco-logging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jaraco-stream[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jaraco-text[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tempora-1.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/irc/irc-20.0.0.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=20681e7e3b770e4a855be6f21e1550b3
diff --git a/metadata/md5-cache/dev-python/openstacksdk-0.99.0 b/metadata/md5-cache/dev-python/openstacksdk-0.99.0
deleted file mode 100644
index 22946999b81d..000000000000
--- a/metadata/md5-cache/dev-python/openstacksdk-0.99.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/ddt-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/prometheus_client-0.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-config-6.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-mock-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/statsd-3.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-3.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/appdirs-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requestsexceptions-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/jsonpatch-1.20[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/os-service-types-1.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/keystoneauth-3.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/munch-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/decorator-4.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/netifaces-0.10.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dogpile-cache-0.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/importlib_metadata[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A collection of libraries for building applications to work with OpenStack
-EAPI=8
-HOMEPAGE=https://github.com/openstack/openstacksdk/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-3.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/appdirs-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requestsexceptions-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/jsonpatch-1.20[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/os-service-types-1.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/keystoneauth-3.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/munch-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/decorator-4.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/netifaces-0.10.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dogpile-cache-0.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/importlib_metadata[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/o/openstacksdk/openstacksdk-0.99.0.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=83c487b91deb61bbc7c441adcd0afad6
diff --git a/metadata/md5-cache/dev-python/pylint-2.14.4 b/metadata/md5-cache/dev-python/pylint-2.14.4
deleted file mode 100644
index 8e9474ba10d5..000000000000
--- a/metadata/md5-cache/dev-python/pylint-2.14.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/GitPython-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( <dev-python/astroid-2.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/astroid-2.11.6[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/tomlkit-0.10.1[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-python/tomli-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/tomli-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python code static checker
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pylint/ https://github.com/PyCQA/pylint/
-INHERIT=distutils-r1
-IUSE=examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=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.6[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/tomlkit-0.10.1[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-python/tomli-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/tomli-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pycqa/pylint/archive/v2.14.4.tar.gz -> pylint-2.14.4.gh.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1467bb03e95c3bad8a11e7342def7d2b
diff --git a/metadata/md5-cache/dev-python/python-cinderclient-8.3.0 b/metadata/md5-cache/dev-python/python-cinderclient-8.3.0
deleted file mode 100644
index 700921fffcad..000000000000
--- a/metadata/md5-cache/dev-python/python-cinderclient-8.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/ddt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/fixtures[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/oslo-serialization[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testtools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/keystoneauth-4.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-i18n-5.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-utils-4.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pbr-5.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/prettytable-0.7.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.25.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/simplejson-3.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-3.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A client for the OpenStack Cinder API
-EAPI=8
-HOMEPAGE=https://launchpad.net/python-cinderclient
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/keystoneauth-4.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-i18n-5.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-utils-4.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pbr-5.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/prettytable-0.7.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.25.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/simplejson-3.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-3.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-cinderclient/python-cinderclient-8.3.0.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=70173260a5328e46190272230361c492
diff --git a/metadata/md5-cache/dev-python/python-swiftclient-4.0.0 b/metadata/md5-cache/dev-python/python-swiftclient-4.0.0
deleted file mode 100644
index 4b32b4e57005..000000000000
--- a/metadata/md5-cache/dev-python/python-swiftclient-4.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/keystoneauth-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-keystoneclient[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mock-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openstacksdk-0.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/requests-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python bindings to the OpenStack Object Storage API
-EAPI=8
-HOMEPAGE=https://launchpad.net/python-swiftclient
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/requests-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-swiftclient/python-swiftclient-4.0.0.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=19d62d3e258b91f8969806ed1ddee4e1
diff --git a/metadata/md5-cache/dev-python/sentry-sdk-1.6.0 b/metadata/md5-cache/dev-python/sentry-sdk-1.7.2
index 5f38763d19f5..594542177fde 100644
--- a/metadata/md5-cache/dev-python/sentry-sdk-1.6.0
+++ b/metadata/md5-cache/dev-python/sentry-sdk-1.7.2
@@ -11,6 +11,6 @@ RDEPEND=dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/getsentry/sentry-python/archive/1.6.0.tar.gz -> sentry-sdk-1.6.0.gh.tar.gz
+SRC_URI=https://github.com/getsentry/sentry-python/archive/1.7.2.tar.gz -> sentry-sdk-1.7.2.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=86720d9b1ddb43d6c6377501d0d8da80
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 64ba08be2605..39b8555a8874 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1 b/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1
deleted file mode 100644
index 570c1a09cc67..000000000000
--- a/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=~app-text/mecab-0.996 ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
-DESCRIPTION=Ruby binding for MeCab
-EAPI=6
-HOMEPAGE=http://taku910.github.io/mecab/
-INHERIT=ruby-ng
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=|| ( BSD LGPL-2.1 GPL-2 )
-RDEPEND=~app-text/mecab-0.996 ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-SLOT=0
-SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mecab/mecab-ruby-0.996.tar.gz
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	55326c3bb01904e05d55c73c84c85d07	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=54d81a019187cd360f863fcd21491383
diff --git a/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r2 b/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r2
index 006e377fca7e..572ad09453e3 100644
--- a/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r2
+++ b/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://taku910.github.io/mecab/
 INHERIT=ruby-ng
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31
-KEYWORDS=amd64 ~ppc ppc64 x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=|| ( BSD LGPL-2.1 GPL-2 )
 RDEPEND=~app-text/mecab-0.996 ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 SLOT=0
 SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mecab/mecab-ruby-0.996.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	55326c3bb01904e05d55c73c84c85d07	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=badb40941c75b702979016a015ac4776
+_md5_=e5522af7f6acc6505759063d4dbaace5
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 85596b7e1407..ef16c7e76ebd 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/cmake-3.24.1 b/metadata/md5-cache/dev-util/cmake-3.24.1
new file mode 100644
index 000000000000..4d6b8ba565bf
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cmake-3.24.1
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-bradking ) doc? ( dev-python/requests dev-python/sphinx ) test? ( app-arch/libarchive[zstd] ) sys-devel/make test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+DESCRIPTION=Cross platform Make
+EAPI=8
+HOMEPAGE=https://cmake.org/
+INHERIT=bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing toolchain-funcs virtualx xdg-utils verify-sig
+IUSE=doc emacs ncurses qt5 test test verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=CMake
+RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://cmake.org/files/v3.24/cmake-3.24.1.tar.gz !doc? ( https://dev.gentoo.org/~sam/distfiles/dev-util/cmake/cmake-3.24.1-docs.tar.xz ) verify-sig? ( https://github.com/Kitware/CMake/releases/download/v3.24.1/cmake-3.24.1-SHA-256.txt https://github.com/Kitware/CMake/releases/download/v3.24.1/cmake-3.24.1-SHA-256.txt.asc )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	44afbf15c35884f7c840470f1cf05d0d	elisp-common	e7aaa047873789f549ea3df2f04b2145	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=3cbefc3486064e5b6b988ebd99be4fac
diff --git a/metadata/md5-cache/dev-util/cmake-9999 b/metadata/md5-cache/dev-util/cmake-9999
index 1cde47284235..e22e794e7386 100644
--- a/metadata/md5-cache/dev-util/cmake-9999
+++ b/metadata/md5-cache/dev-util/cmake-9999
@@ -12,4 +12,4 @@ RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=d
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	44afbf15c35884f7c840470f1cf05d0d	elisp-common	e7aaa047873789f549ea3df2f04b2145	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2bb84adf5f5a0732e6d90c8a0bf539e0
+_md5_=3cbefc3486064e5b6b988ebd99be4fac
diff --git a/metadata/md5-cache/dev-util/pkgdev-0.2.1-r3 b/metadata/md5-cache/dev-util/pkgdev-0.2.1-r3
index a0520b731053..f5971e109696 100644
--- a/metadata/md5-cache/dev-util/pkgdev-0.2.1-r3
+++ b/metadata/md5-cache/dev-util/pkgdev-0.2.1-r3
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgdev/pkgdev-0.2.1.tar.gz !doc? ( https://dev.gentoo.org/~sam/distfiles/dev-util/pkgdev/pkgdev-0.2.1-docs.tar.xz )
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=808e92d560835dc72ed261b26d84a69a
+_md5_=9f048c3597889c2d433cab827a1838db
diff --git a/metadata/md5-cache/dev-util/pkgdev-9999 b/metadata/md5-cache/dev-util/pkgdev-9999
index 43fba004488f..ad2d65ddeeac 100644
--- a/metadata/md5-cache/dev-util/pkgdev-9999
+++ b/metadata/md5-cache/dev-util/pkgdev-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c71a8c97d495736daa5e1d0fe03fdf2d
+_md5_=1de121e1d59c0af746ceb6a24d101754
diff --git a/metadata/md5-cache/dev-util/wayland-scanner-1.20.0 b/metadata/md5-cache/dev-util/wayland-scanner-1.20.0
deleted file mode 100644
index 2fd6cfeea70e..000000000000
--- a/metadata/md5-cache/dev-util/wayland-scanner-1.20.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=!<dev-libs/wayland-1.20.0 >=dev-libs/expat-2.1.0-r3:=
-DESCRIPTION=wayland-scanner tool
-EAPI=7
-HOMEPAGE=https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland
-INHERIT=meson
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=!<dev-libs/wayland-1.20.0 >=dev-libs/expat-2.1.0-r3:=
-SLOT=0
-SRC_URI=https://wayland.freedesktop.org/releases/wayland-1.20.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8a5424eca55266f78ad2b496376856d4
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index adc7ed81f6ae..c0a554a7eec7 100644
--- a/metadata/md5-cache/gui-libs/Manifest.gz
+++ b/metadata/md5-cache/gui-libs/Manifest.gz
diff --git a/metadata/md5-cache/gui-libs/display-manager-init-1.0-r3 b/metadata/md5-cache/gui-libs/display-manager-init-1.0-r3
deleted file mode 100644
index cb3e16a4146d..000000000000
--- a/metadata/md5-cache/gui-libs/display-manager-init-1.0-r3
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install preinst
-DESCRIPTION=RC init files for starting display and login managers
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:X11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-apps/gentoo-functions !<=sys-apps/sysvinit-2.98 !<=x11-apps/xinit-1.4.1 !<=x11-base/xorg-server-1.20.10 !=x11-base/xorg-server-1.20.10-r2
-SLOT=0
-_md5_=9cdf651b15308bc973c4bb6e97f3761c
diff --git a/metadata/md5-cache/gui-libs/gtk-4.6.7 b/metadata/md5-cache/gui-libs/gtk-4.6.7
new file mode 100644
index 000000000000..106b03173dd2
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/gtk-4.6.7
@@ -0,0 +1,18 @@
+BDEPEND=dev-libs/gobject-introspection-common introspection? ( || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/pygobject:3[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) ) dev-python/docutils >=dev-util/gdbus-codegen-2.48 dev-util/glib-utils >=sys-devel/gettext-0.19.7 virtual/pkgconfig test? ( dev-libs/glib:2 wayland? ( dev-libs/weston[headless] ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/fribidi-0.19.7 >=dev-libs/glib-2.66.0:2 >=media-libs/graphene-1.9.1[introspection?] >=media-libs/libepoxy-1.4[egl,X(+)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,X?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?] >=x11-libs/pango-1.50.0[introspection?] media-libs/libpng:0= media-libs/tiff:0= media-libs/libjpeg-turbo:0= >=media-libs/harfbuzz-2.1.0:= x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9:0= ) cups? ( >=net-print/cups-2.0 ) ffmpeg? ( media-video/ffmpeg ) gstreamer? ( >=media-libs/gst-plugins-bad-1.12.3 >=media-libs/gst-plugins-base-1.12.3[opengl] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) vulkan? ( media-libs/vulkan-loader:= ) wayland? ( >=dev-libs/wayland-1.20.0 >=dev-libs/wayland-protocols-1.23 media-libs/mesa[wayland] >=x11-libs/libxkbcommon-0.2 ) X? ( >=app-accessibility/at-spi2-atk-2.5.3 media-libs/fontconfig media-libs/mesa[X(+)] x11-libs/libX11 >=x11-libs/libXi-1.8 x11-libs/libXext >=x11-libs/libXrandr-1.5 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXdamage x11-libs/libXinerama ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) X? ( x11-base/xorg-proto )
+DESCRIPTION=GTK is a multi-platform toolkit for creating graphical user interfaces
+EAPI=8
+HOMEPAGE=https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/
+INHERIT=gnome.org gnome2-utils meson optfeature python-any-r1 virtualx xdg
+IUSE=aqua broadway colord cups examples ffmpeg gstreamer +introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c test
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2+
+PDEPEND=gnome-base/librsvg >=x11-themes/adwaita-icon-theme-3.14
+RDEPEND=>=dev-libs/fribidi-0.19.7 >=dev-libs/glib-2.66.0:2 >=media-libs/graphene-1.9.1[introspection?] >=media-libs/libepoxy-1.4[egl,X(+)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,X?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?] >=x11-libs/pango-1.50.0[introspection?] media-libs/libpng:0= media-libs/tiff:0= media-libs/libjpeg-turbo:0= >=media-libs/harfbuzz-2.1.0:= x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9:0= ) cups? ( >=net-print/cups-2.0 ) ffmpeg? ( media-video/ffmpeg ) gstreamer? ( >=media-libs/gst-plugins-bad-1.12.3 >=media-libs/gst-plugins-base-1.12.3[opengl] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) vulkan? ( media-libs/vulkan-loader:= ) wayland? ( >=dev-libs/wayland-1.20.0 >=dev-libs/wayland-protocols-1.23 media-libs/mesa[wayland] >=x11-libs/libxkbcommon-0.2 ) X? ( >=app-accessibility/at-spi2-atk-2.5.3 media-libs/fontconfig media-libs/mesa[X(+)] x11-libs/libX11 >=x11-libs/libXi-1.8 x11-libs/libXext >=x11-libs/libXrandr-1.5 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXdamage x11-libs/libXinerama ) >=dev-util/gtk-update-icon-cache-3
+REQUIRED_USE=|| ( aqua wayland X ) test? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=4
+SRC_URI=mirror://gnome/sources/gtk/4.6/gtk-4.6.7.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=4dfb3efcfefc8b0242a7facf9e1ca62c
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 809cb65122e0..c1a9f2c522f4 100644
--- a/metadata/md5-cache/media-fonts/Manifest.gz
+++ b/metadata/md5-cache/media-fonts/Manifest.gz
diff --git a/metadata/md5-cache/media-fonts/encodings-1.0.5-r1 b/metadata/md5-cache/media-fonts/encodings-1.0.5-r1
deleted file mode 100644
index 5760fd4ae5e0..000000000000
--- a/metadata/md5-cache/media-fonts/encodings-1.0.5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=x11-apps/mkfontscale >=media-fonts/font-util-1.1.1-r1 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DESCRIPTION=X.Org font encodings
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/encodings
-INHERIT=font xorg-3
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/encodings-1.0.5.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	font	d31f12a0f6e13d56dc3062e76ae58a61	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=8cbb7c1a447730378393f5aed2c15823
diff --git a/metadata/md5-cache/media-fonts/fira-code-4 b/metadata/md5-cache/media-fonts/fira-code-4
deleted file mode 100644
index 6b7005c7a529..000000000000
--- a/metadata/md5-cache/media-fonts/fira-code-4
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=install postinst postrm prepare setup
-DESCRIPTION=Monospaced font with programming ligatures
-EAPI=7
-HOMEPAGE=https://github.com/tonsky/FiraCode
-IUSE=X
-KEYWORDS=amd64 arm arm64 x86
-LICENSE=OFL-1.1
-SLOT=0
-SRC_URI=https://github.com/tonsky/FiraCode/archive/4.tar.gz -> fira-code-4.tar.gz https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip
-_eclasses_=font	d31f12a0f6e13d56dc3062e76ae58a61
-_md5_=e9ee7f60c8c3d0f55425e79349104b4e
diff --git a/metadata/md5-cache/media-fonts/fira-code-5.2 b/metadata/md5-cache/media-fonts/fira-code-5.2
deleted file mode 100644
index bea449df4707..000000000000
--- a/metadata/md5-cache/media-fonts/fira-code-5.2
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=install postinst postrm prepare setup
-DESCRIPTION=Monospaced font with programming ligatures
-EAPI=7
-HOMEPAGE=https://github.com/tonsky/FiraCode
-IUSE=X
-KEYWORDS=amd64 arm arm64 ~riscv x86
-LICENSE=OFL-1.1
-SLOT=0
-SRC_URI=https://github.com/tonsky/FiraCode/archive/5.2.tar.gz -> fira-code-5.2.tar.gz https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip
-_eclasses_=font	d31f12a0f6e13d56dc3062e76ae58a61
-_md5_=370bc6a11a3df1d237fc76718dde37e6
diff --git a/metadata/md5-cache/media-fonts/fira-code-6 b/metadata/md5-cache/media-fonts/fira-code-6
deleted file mode 100644
index f73520ce9f23..000000000000
--- a/metadata/md5-cache/media-fonts/fira-code-6
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=install postinst postrm setup
-DESCRIPTION=Monospaced font with programming ligatures
-EAPI=7
-HOMEPAGE=https://github.com/tonsky/FiraCode
-IUSE=X
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=OFL-1.1
-SLOT=0
-SRC_URI=https://github.com/tonsky/FiraCode/releases/download/6/Fira_Code_v6.zip
-_eclasses_=font	d31f12a0f6e13d56dc3062e76ae58a61
-_md5_=7b030893ada8f9ce46e9ad4f1ded19aa
diff --git a/metadata/md5-cache/media-fonts/fira-code-6.1 b/metadata/md5-cache/media-fonts/fira-code-6.1
deleted file mode 100644
index 1a8800cee5bb..000000000000
--- a/metadata/md5-cache/media-fonts/fira-code-6.1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=install postinst postrm setup
-DESCRIPTION=Monospaced font with programming ligatures
-EAPI=7
-HOMEPAGE=https://github.com/tonsky/FiraCode
-IUSE=X
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=OFL-1.1
-SLOT=0
-SRC_URI=https://github.com/tonsky/FiraCode/releases/download/6.1/Fira_Code_v6.1.zip
-_eclasses_=font	d31f12a0f6e13d56dc3062e76ae58a61
-_md5_=7dd156ce581c6dc1fada25ec0d9635fe
diff --git a/metadata/md5-cache/media-fonts/font-util-1.3.2-r1 b/metadata/md5-cache/media-fonts/font-util-1.3.2-r1
deleted file mode 100644
index 6aa81dd8a1bd..000000000000
--- a/metadata/md5-cache/media-fonts/font-util-1.3.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DESCRIPTION=X.Org font utilities
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/util
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-util-1.3.2.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=8620cb939a917fc13c2d1a6e4319a932
diff --git a/metadata/md5-cache/media-fonts/intlfonts-1.2.1-r1 b/metadata/md5-cache/media-fonts/intlfonts-1.2.1-r1
deleted file mode 100644
index b44bcb349bf1..000000000000
--- a/metadata/md5-cache/media-fonts/intlfonts-1.2.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=x11-apps/bdftopcf >=x11-apps/mkfontscale-1.2.0
-DESCRIPTION=International X11 fixed fonts
-EAPI=7
-HOMEPAGE=https://www.gnu.org/directory/intlfonts.html
-IUSE=bdf non-free X
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=public-domain HPND non-free? ( free-noncomm )
-SLOT=0
-SRC_URI=mirror://gnu/intlfonts/intlfonts-1.2.1.tar.gz
-_eclasses_=font	d31f12a0f6e13d56dc3062e76ae58a61
-_md5_=78c694742cbddde3d09d613960937b8f
diff --git a/metadata/md5-cache/media-fonts/ipaex-002.01 b/metadata/md5-cache/media-fonts/ipaex-002.01
deleted file mode 100644
index 2b294515e067..000000000000
--- a/metadata/md5-cache/media-fonts/ipaex-002.01
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=install postinst postrm setup
-DESCRIPTION=Japanese IPA extended TrueType fonts
-EAPI=7
-HOMEPAGE=https://moji.or.jp/ipafont/
-IUSE=X
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=IPAfont
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://moji.or.jp/wp-content/ipafont/IPAexfont/IPAexfont00201.zip
-_eclasses_=font	d31f12a0f6e13d56dc3062e76ae58a61
-_md5_=7a536303b597f016c7e7d2453252e354
diff --git a/metadata/md5-cache/media-fonts/ipaex-004.01 b/metadata/md5-cache/media-fonts/ipaex-004.01
index 13cde19b7b93..1db3051fc549 100644
--- a/metadata/md5-cache/media-fonts/ipaex-004.01
+++ b/metadata/md5-cache/media-fonts/ipaex-004.01
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://moji.or.jp/ipafont/
 INHERIT=font
 IUSE=X
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=IPAfont
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://moji.or.jp/wp-content/ipafont/IPAexfont/IPAexfont00401.zip
 _eclasses_=font	d31f12a0f6e13d56dc3062e76ae58a61
-_md5_=f6eb71a25d78d3590af655f1f1ecc401
+_md5_=7a40b763a4562a9d7f02e9ef08dcc056
diff --git a/metadata/md5-cache/media-fonts/kanjistrokeorders-4.002 b/metadata/md5-cache/media-fonts/kanjistrokeorders-4.002
deleted file mode 100644
index e042f5d6cf1f..000000000000
--- a/metadata/md5-cache/media-fonts/kanjistrokeorders-4.002
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=install postinst postrm setup
-DESCRIPTION=Font for viewing stroke order diagrams for kanji, kana and other characters
-EAPI=7
-HOMEPAGE=https://sites.google.com/site/nihilistorguk/
-IUSE=X
-KEYWORDS=amd64 arm64 x86
-LICENSE=BSD
-RESTRICT=binchecks
-SLOT=0
-SRC_URI=https://sites.google.com/site/nihilistorguk/KanjiStrokeOrders_v4.002.zip
-_eclasses_=font	d31f12a0f6e13d56dc3062e76ae58a61
-_md5_=d38fdcdb85854db4ae25b68572127ec2
diff --git a/metadata/md5-cache/media-fonts/liberation-fonts-2.1.2 b/metadata/md5-cache/media-fonts/liberation-fonts-2.1.2
deleted file mode 100644
index 1fbb8fa370bd..000000000000
--- a/metadata/md5-cache/media-fonts/liberation-fonts-2.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=fontforge? ( || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) media-gfx/fontforge || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/fonttools[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/fonttools[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/fonttools[python_targets_python3_8(-)] ) ) ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=install postinst postrm prepare setup
-DESCRIPTION=A Helvetica/Times/Courier replacement TrueType font set, courtesy of Red Hat
-EAPI=7
-HOMEPAGE=https://github.com/liberationfonts/liberation-fonts
-INHERIT=font python-any-r1
-IUSE=fontforge X X
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 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/5722232/liberation-fonts-2.1.2.tar.gz ) !fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/5722233/liberation-fonts-ttf-2.1.2.tar.gz )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	font	d31f12a0f6e13d56dc3062e76ae58a61	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=47efbd34268b2b186ef49c0c1f6a2a98
diff --git a/metadata/md5-cache/media-fonts/nanumfont-2.0-r2 b/metadata/md5-cache/media-fonts/nanumfont-2.0-r2
deleted file mode 100644
index 001230c32469..000000000000
--- a/metadata/md5-cache/media-fonts/nanumfont-2.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=install postinst postrm setup unpack
-DESCRIPTION=Korean monospace font distributed by Naver
-EAPI=7
-HOMEPAGE=https://github.com/naver/nanumfont
-IUSE=X
-KEYWORDS=amd64 x86
-LICENSE=OFL-1.1
-RESTRICT=strip binchecks
-SLOT=0
-SRC_URI=https://github.com/naver/nanumfont/releases/download/VER2.0/NanumGothicCoding-2.0.zip
-_eclasses_=font	d31f12a0f6e13d56dc3062e76ae58a61
-_md5_=445fe699014fc32dfecc5d2ab1f606be
diff --git a/metadata/md5-cache/media-fonts/sil-gentium-5.000-r1 b/metadata/md5-cache/media-fonts/sil-gentium-5.000-r1
deleted file mode 100644
index e8e334119f91..000000000000
--- a/metadata/md5-cache/media-fonts/sil-gentium-5.000-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=install postinst postrm setup unpack
-DESCRIPTION=Gentium Plus unicode font for Latin and Greek languages
-EAPI=7
-HOMEPAGE=https://software.sil.org/gentium/
-IUSE=compact doc X
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos
-LICENSE=OFL-1.1
-SLOT=0
-SRC_URI=https://software.sil.org/downloads/r/gentium/GentiumPlus-5.000.zip -> sil-gentium-5.000.zip compact? ( https://software.sil.org/downloads/r/gentium/GentiumPlusCompact-5.000.zip )
-_eclasses_=font	d31f12a0f6e13d56dc3062e76ae58a61
-_md5_=6b92202e31e433262d596ce76e12b224
diff --git a/metadata/md5-cache/media-fonts/sil-gentium-6.001 b/metadata/md5-cache/media-fonts/sil-gentium-6.001
index 83ccac2ebdb1..24f74ecdc6ea 100644
--- a/metadata/md5-cache/media-fonts/sil-gentium-6.001
+++ b/metadata/md5-cache/media-fonts/sil-gentium-6.001
@@ -5,9 +5,9 @@ EAPI=7
 HOMEPAGE=https://software.sil.org/gentium/
 INHERIT=font
 IUSE=doc X
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://software.sil.org/downloads/r/gentium/GentiumPlus-6.001.zip -> sil-gentium-6.001.zip
 _eclasses_=font	d31f12a0f6e13d56dc3062e76ae58a61
-_md5_=63161862e21624217c1c3c106dec0b92
+_md5_=15b9cddbce76ca2ec3b09c749e28420d
diff --git a/metadata/md5-cache/media-fonts/sil-padauk-2.8-r1 b/metadata/md5-cache/media-fonts/sil-padauk-2.8-r1
deleted file mode 100644
index fa18856fd2d6..000000000000
--- a/metadata/md5-cache/media-fonts/sil-padauk-2.8-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=install postinst postrm setup
-DESCRIPTION=SIL fonts for Myanmar script
-EAPI=7
-HOMEPAGE=http://scripts.sil.org/padauk
-IUSE=X
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=OFL
-SLOT=0
-SRC_URI=mirror://gentoo/padauk-2.8.zip
-_eclasses_=font	d31f12a0f6e13d56dc3062e76ae58a61
-_md5_=61e8e033e35ea02838e47aff5e36fb9b
diff --git a/metadata/md5-cache/media-fonts/stix-fonts-1.1.1 b/metadata/md5-cache/media-fonts/stix-fonts-1.1.1
deleted file mode 100644
index 6ee291cc6e69..000000000000
--- a/metadata/md5-cache/media-fonts/stix-fonts-1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=install postinst postrm setup
-DESCRIPTION=Comprehensive OpenType font set of mathematical symbols and alphabets
-EAPI=7
-HOMEPAGE=https://www.stixfonts.org/
-IUSE=X
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=OFL-1.1
-RESTRICT=binchecks strip test
-SLOT=0
-SRC_URI=mirror://sourceforge/stixfonts/STIXv1.1.1-word.zip
-_eclasses_=font	d31f12a0f6e13d56dc3062e76ae58a61
-_md5_=e0817f5ca9b719cb8a8f17d87fe7f1f3
diff --git a/metadata/md5-cache/media-fonts/takao-fonts-003.02.01 b/metadata/md5-cache/media-fonts/takao-fonts-003.02.01
deleted file mode 100644
index 5201bf7ab30b..000000000000
--- a/metadata/md5-cache/media-fonts/takao-fonts-003.02.01
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=install postinst postrm setup
-DESCRIPTION=A community developed derivatives of IPA Fonts
-EAPI=7
-HOMEPAGE=https://launchpad.net/takao-fonts
-IUSE=X
-KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 ~riscv x86
-LICENSE=IPAfont
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://launchpad.net/takao-fonts/trunk/003.02.01/+download/takao-fonts-ttf-003.02.01.tar.gz
-_eclasses_=font	d31f12a0f6e13d56dc3062e76ae58a61
-_md5_=678d50ffc50b895bc7a31e93fd565d65
diff --git a/metadata/md5-cache/media-fonts/unifont-13.0.01-r1 b/metadata/md5-cache/media-fonts/unifont-13.0.01-r1
deleted file mode 100644
index 90a73af70bc8..000000000000
--- a/metadata/md5-cache/media-fonts/unifont-13.0.01-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=fontforge? ( app-text/bdf2psf dev-lang/perl dev-perl/GD[png(+)] media-gfx/fontforge x11-apps/bdftopcf ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=compile install postinst postrm setup
-DESCRIPTION=GNU Unifont - a Pan-Unicode X11 bitmap iso10646 font
-EAPI=7
-HOMEPAGE=http://unifoundry.com/
-INHERIT=font toolchain-funcs
-IUSE=fontforge utils X
-KEYWORDS=~alpha amd64 arm ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=utils? ( dev-lang/perl dev-perl/GD[png(+)] )
-SLOT=0
-SRC_URI=mirror://gnu/unifont/unifont-13.0.01/unifont-13.0.01.tar.gz
-_eclasses_=font	d31f12a0f6e13d56dc3062e76ae58a61	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=7f811b1a6fd601bf218201dca143d5f8
diff --git a/metadata/md5-cache/media-fonts/vlgothic-20141206 b/metadata/md5-cache/media-fonts/vlgothic-20141206
deleted file mode 100644
index 6b32c38ff912..000000000000
--- a/metadata/md5-cache/media-fonts/vlgothic-20141206
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=install postinst postrm setup
-DESCRIPTION=Japanese TrueType font from Vine Linux
-EAPI=7
-HOMEPAGE=http://vlgothic.dicey.org/
-IUSE=X
-KEYWORDS=~alpha amd64 ~arm64 ~ia64 ppc ppc64 sparc x86
-LICENSE=vlgothic mplus-fonts BSD-2
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=mirror://sourceforge.jp/vlgothic/62375/VLGothic-20141206.tar.bz2
-_eclasses_=font	d31f12a0f6e13d56dc3062e76ae58a61
-_md5_=d30f3b60eecd5f0fab509c13bf8a9fe5
diff --git a/metadata/md5-cache/media-fonts/vlgothic-20200720 b/metadata/md5-cache/media-fonts/vlgothic-20200720
index 7377daf121d6..69276493fdd3 100644
--- a/metadata/md5-cache/media-fonts/vlgothic-20200720
+++ b/metadata/md5-cache/media-fonts/vlgothic-20200720
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=http://vlgothic.dicey.org/
 INHERIT=font
 IUSE=X
-KEYWORDS=~alpha amd64 ~arm64 ~ia64 ~loong ~ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 ~arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86
 LICENSE=vlgothic mplus-fonts BSD-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/vlgothic/73361/VLGothic-20200720.tar.xz
 _eclasses_=font	d31f12a0f6e13d56dc3062e76ae58a61
-_md5_=54bd619b07906a0a2be3d13b7cc6c72c
+_md5_=f35388461e0c3290833c6ad82ac3fae6
diff --git a/metadata/md5-cache/media-fonts/vollkorn-2.1 b/metadata/md5-cache/media-fonts/vollkorn-2.1
deleted file mode 100644
index ba702a374847..000000000000
--- a/metadata/md5-cache/media-fonts/vollkorn-2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=install postinst postrm setup
-DESCRIPTION=Vollkorn, the free and healthy typeface for bread and butter use
-EAPI=7
-HOMEPAGE=http://vollkorn-typeface.com/
-IUSE=X
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=OFL-1.1
-RESTRICT=strip binchecks
-SLOT=0
-SRC_URI=http://friedrichalthausen.de/Vollkorn-2.1.zip
-_eclasses_=font	d31f12a0f6e13d56dc3062e76ae58a61
-_md5_=6c27015aed80d6aeca448922f6b3c878
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index fe02680f24c6..01f9f3e8d857 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.13.1-r2 b/metadata/md5-cache/media-libs/fontconfig-2.13.1-r2
deleted file mode 100644
index 6faca3b7865d..000000000000
--- a/metadata/md5-cache/media-libs/fontconfig-2.13.1-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/gperf >=sys-devel/gettext-0.19.8 virtual/pkgconfig doc? ( =app-text/docbook-sgml-dtd-3.1* app-text/docbook-sgml-utils[jadetex] ) 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 preinst prepare 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/freetype-2.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !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(-)?]
-DESCRIPTION=A library for configuring and customizing font access
-EAPI=7
-HOMEPAGE=https://fontconfig.org/
-INHERIT=autotools multilib-minimal readme.gentoo-r1
-IUSE=doc 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
-LICENSE=MIT
-PDEPEND=!x86-winnt? ( app-eselect/eselect-fontconfig ) 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[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(-)?]
-RESTRICT=test
-SLOT=1.0
-SRC_URI=https://fontconfig.org/release/fontconfig-2.13.1.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=424ac5309fa8416382ff2d48a78c3259
diff --git a/metadata/md5-cache/media-libs/libepoxy-1.5.10 b/metadata/md5-cache/media-libs/libepoxy-1.5.10
deleted file mode 100644
index 4c8b56f5809e..000000000000
--- a/metadata/md5-cache/media-libs/libepoxy-1.5.10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10[xml(+)] >=dev-lang/python-3.9.12:3.9[xml(+)] >=dev-lang/python-3.8.13:3.8[xml(+)] ) virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install setup test
-DEPEND=egl? ( media-libs/mesa[egl(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Library for handling OpenGL function pointer management
-EAPI=7
-HOMEPAGE=https://github.com/anholt/libepoxy
-INHERIT=meson-multilib python-any-r1 virtualx
-IUSE=+egl test +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=egl? ( media-libs/mesa[egl(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/anholt/libepoxy/archive/1.5.10.tar.gz -> libepoxy-1.5.10.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=84171e38518fd448e14b91349ff7554a
diff --git a/metadata/md5-cache/media-libs/libuninameslist-20200413-r1 b/metadata/md5-cache/media-libs/libuninameslist-20200413-r1
deleted file mode 100644
index 8466a9983404..000000000000
--- a/metadata/md5-cache/media-libs/libuninameslist-20200413-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Library of unicode annotation data
-EAPI=7
-HOMEPAGE=https://github.com/fontforge/libuninameslist
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=BSD
-SLOT=0/1
-SRC_URI=https://github.com/fontforge/libuninameslist/releases/download/20200413/libuninameslist-dist-20200413.tar.gz
-_md5_=da7f21706ea6f83ec076bf5e996f056c
diff --git a/metadata/md5-cache/media-libs/libuninameslist-20200413-r2 b/metadata/md5-cache/media-libs/libuninameslist-20200413-r2
deleted file mode 100644
index ba628f1ec5e7..000000000000
--- a/metadata/md5-cache/media-libs/libuninameslist-20200413-r2
+++ /dev/null
@@ -1,12 +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=configure install prepare
-DESCRIPTION=Library of unicode annotation data
-EAPI=7
-HOMEPAGE=https://github.com/fontforge/libuninameslist
-INHERIT=autotools
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=BSD
-SLOT=0/1
-SRC_URI=https://github.com/fontforge/libuninameslist/releases/download/20200413/libuninameslist-dist-20200413.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=fb3a9c3dea3b1c5a3e69f95c2df3dbce
diff --git a/metadata/md5-cache/media-libs/libuninameslist-20211114 b/metadata/md5-cache/media-libs/libuninameslist-20211114
index 195bec6101c8..d7148c1d24c2 100644
--- a/metadata/md5-cache/media-libs/libuninameslist-20211114
+++ b/metadata/md5-cache/media-libs/libuninameslist-20211114
@@ -4,9 +4,9 @@ DESCRIPTION=Library of unicode annotation data
 EAPI=8
 HOMEPAGE=https://github.com/fontforge/libuninameslist
 INHERIT=autotools
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=BSD
 SLOT=0/1
 SRC_URI=https://github.com/fontforge/libuninameslist/releases/download/20211114/libuninameslist-dist-20211114.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d2e7505b681abde1058c0a5ab9f7cdc4
+_md5_=3fd88fd2f9f230d1471be723ddc8e684
diff --git a/metadata/md5-cache/media-libs/mesa-22.0.5 b/metadata/md5-cache/media-libs/mesa-22.0.5
deleted file mode 100644
index 23a642ad4dae..000000000000
--- a/metadata/md5-cache/media-libs/mesa-22.0.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-)] ) ) wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.62.2 >=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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)?] 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-15:=[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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)?] 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-15:=[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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)?] 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-15:=[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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)?] 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-15:=[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.5.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	56708ddc53d8b607ed88fd97a56e59dc	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0493eee6f23f376bac694d03956cf41a
diff --git a/metadata/md5-cache/media-libs/mesa-22.1.2 b/metadata/md5-cache/media-libs/mesa-22.1.2
deleted file mode 100644
index f569f42657a4..000000000000
--- a/metadata/md5-cache/media-libs/mesa-22.1.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-)] ) ) wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.62.2 >=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.110[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.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( 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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)?] 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-15:=[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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)?] 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-15:=[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=8
-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 ~loong ~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.110[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.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( 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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)?] 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-15:=[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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)?] 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-15:=[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.1.2.tar.xz
-_eclasses_=linux-info	56708ddc53d8b607ed88fd97a56e59dc	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1b69bc6d3ed78844cd3428455fe993cb
diff --git a/metadata/md5-cache/media-libs/mesa-22.1.5 b/metadata/md5-cache/media-libs/mesa-22.1.5
deleted file mode 100644
index 5d2baf5007a3..000000000000
--- a/metadata/md5-cache/media-libs/mesa-22.1.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-)] ) ) wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.62.2 >=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.110[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.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( 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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)?] 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-15:=[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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)?] 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-15:=[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=8
-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 ~loong ~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.110[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.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( 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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)?] 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-15:=[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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)?] 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-15:=[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.1.5.tar.xz
-_eclasses_=linux-info	56708ddc53d8b607ed88fd97a56e59dc	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8325aaf8447af95188265e160c7c658e
diff --git a/metadata/md5-cache/media-libs/mesa-22.1.6 b/metadata/md5-cache/media-libs/mesa-22.1.6
deleted file mode 100644
index 017bb8999dfc..000000000000
--- a/metadata/md5-cache/media-libs/mesa-22.1.6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-)] ) ) wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.62.2 >=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.110[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.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( 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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)?] 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-15:=[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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)?] 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-15:=[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=8
-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 ~loong ~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.110[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.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( 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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)?] 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-15:=[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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)] 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-15:=[abi_x86_32(-)?,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: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(-)?] 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-15:=[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.1.6.tar.xz
-_eclasses_=linux-info	56708ddc53d8b607ed88fd97a56e59dc	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8325aaf8447af95188265e160c7c658e
diff --git a/metadata/md5-cache/media-libs/waffle-1.7.0-r1 b/metadata/md5-cache/media-libs/waffle-1.7.0-r1
deleted file mode 100644
index 43685f6aa5b8..000000000000
--- a/metadata/md5-cache/media-libs/waffle-1.7.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-libs/libxslt app-text/docbook-xml-dtd:4.2 >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/mesa-9.1.6[egl(+)?,gbm(+)?,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/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(-)?] ) gbm? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-base/xcb-proto-1.8-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(-)?] )
-DESCRIPTION=Library that allows selection of GL API and of window system at runtime
-EAPI=7
-HOMEPAGE=http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle
-INHERIT=meson-multilib
-IUSE=doc +egl +gbm wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 x86
-LICENSE=BSD-2
-RDEPEND=>=media-libs/mesa-9.1.6[egl(+)?,gbm(+)?,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/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(-)?] ) gbm? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://gitlab.freedesktop.org/mesa/waffle/-/archive/v1.7.0/waffle-v1.7.0.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ac3ed0f224e07516689d6fc74a6c0726
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index a2e3302f847a..768a22742fec 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/wireshark-4.0.0_rc1 b/metadata/md5-cache/net-analyzer/wireshark-4.0.0_rc1
new file mode 100644
index 000000000000..8b8035fbcfc4
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/wireshark-4.0.0_rc1
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-lang/perl sys-devel/flex sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) test? ( || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/pytest[python_targets_python3_10(-)] dev-python/pytest-xdist[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/pytest[python_targets_python3_9(-)] dev-python/pytest-xdist[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/pytest[python_targets_python3_8(-)] dev-python/pytest-xdist[python_targets_python3_8(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=acct-group/pcap >=dev-libs/glib-2.50.0:2 dev-libs/libpcre2 >=net-dns/c-ares-1.14.0:= >=dev-libs/libgcrypt-1.8.0:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( >=net-libs/nghttp2-1.11.0:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( >=net-libs/gnutls-3.5.8:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=A network protocol analyzer formerly known as ethereal
+EAPI=8
+HOMEPAGE=https://www.wireshark.org/
+INHERIT=fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
+IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd +filecaps +lua_single_target_lua5-1
+LICENSE=GPL-2
+RDEPEND=acct-group/pcap >=dev-libs/glib-2.50.0:2 dev-libs/libpcre2 >=net-dns/c-ares-1.14.0:= >=dev-libs/libgcrypt-1.8.0:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( >=net-libs/nghttp2-1.11.0:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( >=net-libs/gnutls-3.5.8:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) plugin-ifdemo? ( plugins )
+RESTRICT=!test? ( test )
+SLOT=0/4.0.0_rc1
+SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-4.0.0rc1.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=15bcb0dc28e0d07945ba2a67e58abe16
diff --git a/metadata/md5-cache/net-analyzer/wireshark-9999 b/metadata/md5-cache/net-analyzer/wireshark-9999
index d6b3592bc7f3..d6d7dfbfc78d 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-9999
+++ b/metadata/md5-cache/net-analyzer/wireshark-9999
@@ -1,6 +1,6 @@
 BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-lang/perl sys-devel/flex sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) test? ( || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/pytest[python_targets_python3_10(-)] dev-python/pytest-xdist[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/pytest[python_targets_python3_9(-)] dev-python/pytest-xdist[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/pytest[python_targets_python3_8(-)] dev-python/pytest-xdist[python_targets_python3_8(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=acct-group/pcap >=dev-libs/glib-2.38:2 >=net-dns/c-ares-1.5:= dev-libs/libgcrypt:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= )
+DEPEND=acct-group/pcap >=dev-libs/glib-2.50.0:2 dev-libs/libpcre2 >=net-dns/c-ares-1.14.0:= >=dev-libs/libgcrypt-1.8.0:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( >=net-libs/nghttp2-1.11.0:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( >=net-libs/gnutls-3.5.8:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=8
 HOMEPAGE=https://www.wireshark.org/
@@ -8,9 +8,9 @@ INHERIT=fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake git-r3
 IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd +filecaps +lua_single_target_lua5-1
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=acct-group/pcap >=dev-libs/glib-2.38:2 >=net-dns/c-ares-1.5:= dev-libs/libgcrypt:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
+RDEPEND=acct-group/pcap >=dev-libs/glib-2.50.0:2 dev-libs/libpcre2 >=net-dns/c-ares-1.14.0:= >=dev-libs/libgcrypt-1.8.0:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( >=net-libs/nghttp2-1.11.0:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( >=net-libs/gnutls-3.5.8:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) plugin-ifdemo? ( plugins )
 RESTRICT=!test? ( test )
 SLOT=0/9999
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9dddfffbb0e839449c1f51352be8a80a
+_md5_=15bcb0dc28e0d07945ba2a67e58abe16
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 54d802e19019..8564d6298272 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/bind-9.16.32 b/metadata/md5-cache/net-dns/bind-9.16.32
new file mode 100644
index 000000000000..0cbf62c2bfa7
--- /dev/null
+++ b/metadata/md5-cache/net-dns/bind-9.16.32
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-util/cmocka dev-util/kyua ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst prepare test
+DEPEND=acct-group/named acct-user/named berkdb? ( sys-libs/db:= ) dev-libs/openssl:=[-bindist(-)] mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap:= ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( dev-libs/libmaxminddb:= ) geoip2? ( dev-libs/libmaxminddb:= ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb:= ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-python/ply[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-libs/libuv:=
+DESCRIPTION=Berkeley Internet Name Domain - Name Server
+EAPI=8
+HOMEPAGE=https://www.isc.org/software/bind https://gitlab.isc.org/isc-projects/bind9
+INHERIT=python-r1 autotools multiprocessing toolchain-funcs flag-o-matic db-use systemd tmpfiles
+IUSE=berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi json ldap lmdb mysql odbc postgres python selinux static-libs test xml +zlib python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
+RDEPEND=acct-group/named acct-user/named berkdb? ( sys-libs/db:= ) dev-libs/openssl:=[-bindist(-)] mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap:= ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( dev-libs/libmaxminddb:= ) geoip2? ( dev-libs/libmaxminddb:= ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb:= ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-python/ply[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-libs/libuv:= selinux? ( sec-policy/selinux-bind ) sys-process/psmisc virtual/tmpfiles
+REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz ) odbc? ( dlz ) ldap? ( dlz ) dnsrps? ( dlz ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://downloads.isc.org/isc/bind9/9.16.32/bind-9.16.32.tar.xz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	db-use	867a9246a45efc09934e0f8e3380c813	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=856642ca8401bbc075bc1aca38e30493
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.16.32 b/metadata/md5-cache/net-dns/bind-tools-9.16.32
new file mode 100644
index 000000000000..2a41f3f465b4
--- /dev/null
+++ b/metadata/md5-cache/net-dns/bind-tools-9.16.32
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx ) test? ( dev-util/cmocka dev-util/kyua ) 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
+DEPEND=dev-libs/libuv:= dev-libs/openssl:= caps? ( sys-libs/libcap ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:= ) )
+DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
+EAPI=8
+HOMEPAGE=https://www.isc.org/software/bind https://gitlab.isc.org/isc-projects/bind9
+INHERIT=autotools flag-o-matic multiprocessing toolchain-funcs
+IUSE=+caps doc gssapi idn libedit readline test xml
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
+RDEPEND=dev-libs/libuv:= dev-libs/openssl:= caps? ( sys-libs/libcap ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:= ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://downloads.isc.org/isc/bind9/9.16.32/bind-9.16.32.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=e022f26dd1e9f9beea9e1e687effc872
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 47f98f3a5578..95bf68368702 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/tempestsdr-0.0_p20200221 b/metadata/md5-cache/net-wireless/tempestsdr-0.0_p20200221-r1
index 0068472261b5..302d439f78f4 100644
--- a/metadata/md5-cache/net-wireless/tempestsdr-0.0_p20200221
+++ b/metadata/md5-cache/net-wireless/tempestsdr-0.0_p20200221-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.8:* net-wireless/airspy net-wireless/uhd:= net-wireless/rtl-sdr net-wireless/bladerf:= net-wireless/hackrf-tools >=dev-java/java-config-2.2.0-r3
+DEPEND=>=virtual/jdk-1.8:* dev-libs/boost:= net-wireless/airspy net-wireless/uhd:= net-wireless/rtl-sdr net-wireless/bladerf:= net-wireless/hackrf-tools >=dev-java/java-config-2.2.0-r3
 DESCRIPTION=Remote video eavesdropping using a software-defined radio platform
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/deltj/TempestSDR.git
 INHERIT=java-pkg-2
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=virtual/jdk-1.8:* net-wireless/airspy net-wireless/uhd:= net-wireless/rtl-sdr net-wireless/bladerf:= net-wireless/hackrf-tools >=dev-java/java-config-2.2.0-r3
+RDEPEND=>=virtual/jdk-1.8:* dev-libs/boost:= net-wireless/airspy net-wireless/uhd:= net-wireless/rtl-sdr net-wireless/bladerf:= net-wireless/hackrf-tools >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/deltj/TempestSDR/archive/93c238725bdcf2f50c8a1d3789cf56e90f7bab7f.tar.gz -> tempestsdr-0.0_p20200221.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=8ce7784a45e4bdf0ec161c537955138d
+_md5_=32edec977367e908a7d93e10684382a3
diff --git a/metadata/md5-cache/net-wireless/tempestsdr-9999 b/metadata/md5-cache/net-wireless/tempestsdr-9999
index 7e4c27bd11ba..09b24ce47d98 100644
--- a/metadata/md5-cache/net-wireless/tempestsdr-9999
+++ b/metadata/md5-cache/net-wireless/tempestsdr-9999
@@ -1,13 +1,13 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.8:* net-wireless/airspy net-wireless/uhd:= net-wireless/rtl-sdr net-wireless/bladerf:= net-wireless/hackrf-tools >=dev-java/java-config-2.2.0-r3
+DEPEND=>=virtual/jdk-1.8:* dev-libs/boost:= net-wireless/airspy net-wireless/uhd:= net-wireless/rtl-sdr net-wireless/bladerf:= net-wireless/hackrf-tools >=dev-java/java-config-2.2.0-r3
 DESCRIPTION=Remote video eavesdropping using a software-defined radio platform
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/deltj/TempestSDR.git
 INHERIT=java-pkg-2 git-r3
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=>=virtual/jdk-1.8:* net-wireless/airspy net-wireless/uhd:= net-wireless/rtl-sdr net-wireless/bladerf:= net-wireless/hackrf-tools >=dev-java/java-config-2.2.0-r3
+RDEPEND=>=virtual/jdk-1.8:* dev-libs/boost:= net-wireless/airspy net-wireless/uhd:= net-wireless/rtl-sdr net-wireless/bladerf:= net-wireless/hackrf-tools >=dev-java/java-config-2.2.0-r3
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=8ce7784a45e4bdf0ec161c537955138d
+_md5_=32edec977367e908a7d93e10684382a3
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 725715450e27..bfebf476e4bc 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/hdf5-1.12.2-r5 b/metadata/md5-cache/sci-libs/hdf5-1.12.2-r5
new file mode 100644
index 000000000000..e6f09cb92546
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/hdf5-1.12.2-r5
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 fortran? ( virtual/fortran )
+DEFINED_PHASES=configure install prepare setup
+DEPEND=mpi? ( virtual/mpi[romio] ) szip? ( virtual/szip ) zlib? ( sys-libs/zlib:0= ) fortran? ( virtual/fortran )
+DESCRIPTION=General purpose library and file format for storing scientific data
+EAPI=8
+HOMEPAGE=https://www.hdfgroup.org/HDF5/
+INHERIT=autotools fortran-2 flag-o-matic toolchain-funcs prefix
+IUSE=cxx debug examples fortran +hl mpi szip threads unsupported zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=NCSA-HDF
+RDEPEND=mpi? ( virtual/mpi[romio] ) szip? ( virtual/szip ) zlib? ( sys-libs/zlib:0= ) fortran? ( virtual/fortran )
+REQUIRED_USE=!unsupported? ( cxx? ( !mpi ) mpi? ( !cxx ) threads? ( !cxx !mpi !fortran !hl ) )
+SLOT=0/1.12.2
+SRC_URI=https://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.12/hdf5-1.12.2/src/hdf5-1.12.2.tar.bz2
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=8d13b6cd239ea731f6b23243e3092113
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index a8a687c8b823..86200143bd8f 100644
--- a/metadata/md5-cache/sec-keys/Manifest.gz
+++ b/metadata/md5-cache/sec-keys/Manifest.gz
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-bradking-20220818 b/metadata/md5-cache/sec-keys/openpgp-keys-bradking-20220818
new file mode 100644
index 000000000000..b321fd4277a9
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-bradking-20220818
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used by Brad King
+EAPI=7
+HOMEPAGE=https://cmake.org/download/
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-bradking/openpgp-keys-bradking-20220818-2D2CEF1034921684.asc
+_md5_=d40ae724347eec83d9f7289f66c35367
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 78b6516b7bcb..14c59e24ad31 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.61 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.61
new file mode 100644
index 000000000000..125131fcd973
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.61
@@ -0,0 +1,17 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.15.61
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.15.61 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.15.61
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-65.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-65.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	9f89ee029a72742cecbcbf94122cb9cb	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=ac84ab5dd6c41b9ba65f7e73d3fdc0fc
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.18.18 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.18.18
new file mode 100644
index 000000000000..1da6b0909099
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.18.18
@@ -0,0 +1,17 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.18.18
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.18.18 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.18.18
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-22.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-22.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g2.tar.gz -> gentoo-kernel-config-g2.tar.gz amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.18.18-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.18.18-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.18.18-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.18.18-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.18.18-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.18.18-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.18.18-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.18.18-gentoo )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	9f89ee029a72742cecbcbf94122cb9cb	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=bfc681caa13983239e0f7012a5cf6e21
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.61 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.61
new file mode 100644
index 000000000000..0e4f3f7dab24
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.61
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-install toolchain-funcs
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.15.61
+RDEPEND=!sys-kernel/gentoo-kernel:5.15.61 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.15.61
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-65.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-65.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.61-1.xpak -> gentoo-kernel-5.15.61-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.61-1.xpak -> gentoo-kernel-5.15.61-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.61-1.xpak -> gentoo-kernel-5.15.61-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.61-1.xpak -> gentoo-kernel-5.15.61-1.x86.xpak )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=727580f9402ad362cb324566395d639e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.18.18 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.18.18
new file mode 100644
index 000000000000..ea21dd82d655
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.18.18
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-install toolchain-funcs
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.18.18
+RDEPEND=!sys-kernel/gentoo-kernel:5.18.18 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.18.18
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-22.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-22.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.18-1.xpak -> gentoo-kernel-5.18.18-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.18-1.xpak -> gentoo-kernel-5.18.18-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.18-1.xpak -> gentoo-kernel-5.18.18-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.18-1.xpak -> gentoo-kernel-5.18.18-1.x86.xpak )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=727580f9402ad362cb324566395d639e
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.61 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.61
new file mode 100644
index 000000000000..e77de3e6be6a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.61
@@ -0,0 +1,17 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.15.61
+RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.15.61
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.61.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.61.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	9f89ee029a72742cecbcbf94122cb9cb	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=f0a0937a2aa2a625e702de483cb304e7
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.18.18 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.18.18
new file mode 100644
index 000000000000..40af2c0747d8
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.18.18
@@ -0,0 +1,17 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.18.18
+RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.18.18
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.18.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.18.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.18.18-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.18.18-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.18.18-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.18.18-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.18.18-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.18.18-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.18.18-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.18.18-gentoo )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	9f89ee029a72742cecbcbf94122cb9cb	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=30505e85bc406755e4124256832c0e87
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index f663999641cd..ed25dd3f90cc 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/libunwind-1.6.2-r1 b/metadata/md5-cache/sys-libs/libunwind-1.6.2-r1
index c13960c2a39a..78b8e4bae76b 100644
--- a/metadata/md5-cache/sys-libs/libunwind-1.6.2-r1
+++ b/metadata/md5-cache/sys-libs/libunwind-1.6.2-r1
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0/8
 SRC_URI=mirror://nongnu/libunwind/libunwind-1.6.2.tar.gz !doc? ( https://dev.gentoo.org/~sam/distfiles/sys-libs/libunwind/libunwind-1.6.2-docs.tar.xz )
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2127dfb6d7ea606bc9c4bc56f76e7a28
+_md5_=ba66ce5473bc4c42070ed81f2f41a16a
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 13aac6f392c1..adab6f846dc3 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.15.61 b/metadata/md5-cache/virtual/dist-kernel-5.15.61
new file mode 100644
index 000000000000..d46288fee714
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.15.61
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.15.61 ~sys-kernel/gentoo-kernel-bin-5.15.61 ~sys-kernel/vanilla-kernel-5.15.61 )
+SLOT=0/5.15.61
+_md5_=8d5178e82e5992dcec134c02ff7397e0
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.18.18 b/metadata/md5-cache/virtual/dist-kernel-5.18.18
new file mode 100644
index 000000000000..c39bc08d6e81
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.18.18
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.18.18 ~sys-kernel/gentoo-kernel-bin-5.18.18 ~sys-kernel/vanilla-kernel-5.18.18 )
+SLOT=0/5.18.18
+_md5_=62eff3c91f3533c035b4103dfd4b6dd7
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index 3ea238d55388..44dcb81c05ba 100644
--- a/metadata/md5-cache/x11-apps/Manifest.gz
+++ b/metadata/md5-cache/x11-apps/Manifest.gz
diff --git a/metadata/md5-cache/x11-apps/mesa-progs-8.4.0-r1 b/metadata/md5-cache/x11-apps/mesa-progs-8.4.0-r1
deleted file mode 100644
index f373bb44988d..000000000000
--- a/metadata/md5-cache/x11-apps/mesa-progs-8.4.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-apps/grep sys-apps/file
-DEFINED_PHASES=compile install prepare
-DEPEND=media-libs/mesa[egl(+)?,gles2?] virtual/opengl x11-libs/libX11 media-libs/glew virtual/glu x11-base/xorg-proto
-DESCRIPTION=Mesa's OpenGL utility and demo programs (glxgears and glxinfo)
-EAPI=7
-HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/ https://gitlab.freedesktop.org/mesa/demos
-IUSE=egl gles2
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2
-RDEPEND=media-libs/mesa[egl(+)?,gles2?] virtual/opengl x11-libs/libX11
-SLOT=0
-SRC_URI=https://mesa.freedesktop.org/archive/demos/mesa-demos-8.4.0.tar.bz2 https://mesa.freedesktop.org/archive/demos/8.4.0/mesa-demos-8.4.0.tar.bz2
-_md5_=10acaee0b9d3b37ff13f30cb16adb17d
diff --git a/metadata/md5-cache/x11-apps/xclipboard-1.1.3 b/metadata/md5-cache/x11-apps/xclipboard-1.1.3
deleted file mode 100644
index 5c77a9b8dcdd..000000000000
--- a/metadata/md5-cache/x11-apps/xclipboard-1.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-libs/libXaw x11-libs/libxkbfile x11-libs/libXmu >=x11-libs/libXt-1.1 x11-libs/libX11
-DESCRIPTION=interchange between cut buffer and selection
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xclipboard
-INHERIT=xorg-3
-KEYWORDS=amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libXaw x11-libs/libxkbfile x11-libs/libXmu >=x11-libs/libXt-1.1 x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xclipboard-1.1.3.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=3b50c3e6b303efec28c4939eaf974f0b
diff --git a/metadata/md5-cache/x11-apps/xcmsdb-1.0.5-r1 b/metadata/md5-cache/x11-apps/xcmsdb-1.0.5-r1
deleted file mode 100644
index e2766f60a7d5..000000000000
--- a/metadata/md5-cache/x11-apps/xcmsdb-1.0.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-libs/libX11 x11-base/xorg-proto
-DESCRIPTION=Device Color Characterization utility for X Color Management System
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xcmsdb
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xcmsdb-1.0.5.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=908e40622dacbfa098a0e354b34dff59
diff --git a/metadata/md5-cache/x11-apps/xconsole-1.0.7 b/metadata/md5-cache/x11-apps/xconsole-1.0.7
deleted file mode 100644
index 98e9037781db..000000000000
--- a/metadata/md5-cache/x11-apps/xconsole-1.0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
-DESCRIPTION=monitor system console messages with X
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xconsole
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xconsole-1.0.7.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=c38d5b070b1a8e54c88caae24ef963b1
diff --git a/metadata/md5-cache/x11-apps/xev-1.2.4 b/metadata/md5-cache/x11-apps/xev-1.2.4
deleted file mode 100644
index 81480ffc10e3..000000000000
--- a/metadata/md5-cache/x11-apps/xev-1.2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-libs/libX11 x11-libs/libXrandr x11-base/xorg-proto
-DESCRIPTION=Print contents of X events
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xev
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-winnt
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXrandr
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xev-1.2.4.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=e6508ab3a0c646539df6dc4d9c74ff77
diff --git a/metadata/md5-cache/x11-apps/xfontsel-1.0.6 b/metadata/md5-cache/x11-apps/xfontsel-1.0.6
deleted file mode 100644
index 6b8b9f8f7714..000000000000
--- a/metadata/md5-cache/x11-apps/xfontsel-1.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
-DESCRIPTION=point and click selection of X11 font names
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xfontsel
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=MIT
-RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xfontsel-1.0.6.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=b4f3f67d9233185d6ab65f97cd0f6d15
diff --git a/metadata/md5-cache/x11-apps/xkbutils-1.0.4-r1 b/metadata/md5-cache/x11-apps/xkbutils-1.0.4-r1
deleted file mode 100644
index 2946ac7653a1..000000000000
--- a/metadata/md5-cache/x11-apps/xkbutils-1.0.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXaw x11-base/xorg-proto
-DESCRIPTION=X.Org xkbutils application
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xkbutils
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXaw
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xkbutils-1.0.4.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=830309f3d1846d0d8016b909327245e7
diff --git a/metadata/md5-cache/x11-apps/xmag-1.0.6 b/metadata/md5-cache/x11-apps/xmag-1.0.6
deleted file mode 100644
index 0bcbf8e6a71d..000000000000
--- a/metadata/md5-cache/x11-apps/xmag-1.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
-DESCRIPTION=X.Org xmag application
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xmag
-INHERIT=xorg-3
-KEYWORDS=amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xmag-1.0.6.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=34da7d042a2a3825f17452fb1db080fd
diff --git a/metadata/md5-cache/x11-apps/xmessage-1.0.5-r1 b/metadata/md5-cache/x11-apps/xmessage-1.0.5-r1
deleted file mode 100644
index d47b43c0329c..000000000000
--- a/metadata/md5-cache/x11-apps/xmessage-1.0.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-libs/libXaw x11-libs/libXt
-DESCRIPTION=display a message or query in a window (X-based /bin/echo)
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xmessage
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=x11-libs/libXaw x11-libs/libXt
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xmessage-1.0.5.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=92d2fb41576c45e0cee1d7858dd35723
diff --git a/metadata/md5-cache/x11-apps/xmodmap-1.0.10 b/metadata/md5-cache/x11-apps/xmodmap-1.0.10
deleted file mode 100644
index 2ba85459b3d0..000000000000
--- a/metadata/md5-cache/x11-apps/xmodmap-1.0.10
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-libs/libX11
-DESCRIPTION=utility for modifying keymaps and pointer button mappings in X
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xmodmap
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xmodmap-1.0.10.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=08014b5dd2e27fe1dc70b5d94df6012c
diff --git a/metadata/md5-cache/x11-apps/xpr-1.0.5-r1 b/metadata/md5-cache/x11-apps/xpr-1.0.5-r1
deleted file mode 100644
index 8bd0f9aa1313..000000000000
--- a/metadata/md5-cache/x11-apps/xpr-1.0.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-base/xorg-proto
-DESCRIPTION=X.Org xpr application
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xpr
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXmu
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xpr-1.0.5.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=d96ae927dcb15d50f46eb7941b6cd195
diff --git a/metadata/md5-cache/x11-apps/xrefresh-1.0.6-r1 b/metadata/md5-cache/x11-apps/xrefresh-1.0.6-r1
deleted file mode 100644
index be966e5a6354..000000000000
--- a/metadata/md5-cache/x11-apps/xrefresh-1.0.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-libs/libX11 x11-base/xorg-proto
-DESCRIPTION=refresh all or part of an X screen
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xrefresh
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xrefresh-1.0.6.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=80e3190271dcb1ddaefd63bd8340c407
diff --git a/metadata/md5-cache/x11-apps/xwud-1.0.5-r1 b/metadata/md5-cache/x11-apps/xwud-1.0.5-r1
deleted file mode 100644
index e27d545781d2..000000000000
--- a/metadata/md5-cache/x11-apps/xwud-1.0.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-libs/libX11 x11-base/xorg-proto
-DESCRIPTION=image displayer for X
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xwud
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xwud-1.0.5.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=6350955f1863f4c3dd45b18769015feb
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index 283381a9f784..02a49662c719 100644
--- a/metadata/md5-cache/x11-base/Manifest.gz
+++ b/metadata/md5-cache/x11-base/Manifest.gz
diff --git a/metadata/md5-cache/x11-base/xcb-proto-1.15 b/metadata/md5-cache/x11-base/xcb-proto-1.15
deleted file mode 100644
index d1b04e1f8e22..000000000000
--- a/metadata/md5-cache/x11-base/xcb-proto-1.15
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/libxml2 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DESCRIPTION=X C-language Bindings protocol headers
-EAPI=7
-HOMEPAGE=https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/proto/xcbproto
-INHERIT=python-r1 xorg-3
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/proto/xcb-proto-1.15.tar.xz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=9d9d56b67584aace01b7e5e59fee480b
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index efae54281240..70865262e782 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.1 b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.1
deleted file mode 100644
index 7d0a217ad118..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup unpack
-DEPEND=>=x11-base/xorg-server-1.14 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 kernel_linux? ( >=dev-libs/libevdev-0.4 ) >=sys-kernel/linux-headers-2.6.37 x11-base/xorg-proto x11-base/xorg-proto >=x11-base/xorg-server-1.20[xorg]
-DESCRIPTION=Driver for Synaptics touchpads
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-input-synaptics
-INHERIT=linux-info xorg-3
-KEYWORDS=amd64 arm arm64 ~loong ~mips ppc ppc64 x86
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.14 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 kernel_linux? ( >=dev-libs/libevdev-0.4 ) x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg]
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	56708ddc53d8b607ed88fd97a56e59dc	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=5d215215826cfba1fcaecb2c35fcc4a1
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-mga-2.0.0 b/metadata/md5-cache/x11-drivers/xf86-video-mga-2.0.0
deleted file mode 100644
index efd9dc1068df..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-mga-2.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-base/xorg-proto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
-DESCRIPTION=Matrox video driver
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-mga
-INHERIT=xorg-3
-IUSE=dri
-KEYWORDS=~alpha amd64 ~ia64 ~loong ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=x11-base/xorg-server:= dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-mga-2.0.0.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=d4a489bbfa222fd65b67897fe3751682
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 3b8b7c1eafd1..9c84bbe88531 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.111 b/metadata/md5-cache/x11-libs/libdrm-2.4.111
deleted file mode 100644
index 65414ae5abe1..000000000000
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.111
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/docutils[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/docutils[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/docutils[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install setup test
-DEPEND=video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) valgrind? ( dev-util/valgrind )
-DESCRIPTION=X.Org libdrm library
-EAPI=7
-HOMEPAGE=https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm
-INHERIT=python-any-r1 meson-multilib
-IUSE=video_cards_amdgpu video_cards_exynos video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_tegra video_cards_vc4 video_cards_vivante video_cards_vmware valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.111.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9126e1c59a38b99bdf171f3dfb3af42b
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.15 b/metadata/md5-cache/x11-libs/libxcb-1.15
deleted file mode 100644
index 089af7daf98b..000000000000
--- a/metadata/md5-cache/x11-libs/libxcb-1.15
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10[xml] >=dev-lang/python-3.9.12:3.9[xml] >=dev-lang/python-3.8.13:3.8[xml] ) || ( ( >=dev-lang/python-3.10.4:3.10[xml] >=x11-base/xcb-proto-1.15[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9[xml] >=x11-base/xcb-proto-1.15[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8[xml] >=x11-base/xcb-proto-1.15[python_targets_python3_8(-)] ) ) doc? ( app-doc/doxygen[dot] ) test? ( dev-libs/libxslt ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-base/xcb-proto-1.15[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? ( dev-libs/libpthread-stubs ) test? ( dev-libs/check[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=X C-language Bindings library
-EAPI=7
-HOMEPAGE=https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb
-INHERIT=python-any-r1 xorg-3
-IUSE=doc selinux test +xkb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 doc
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=!test? ( test )
-SLOT=0/1.12
-SRC_URI=https://www.x.org/releases/individual/lib/libxcb-1.15.tar.xz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=9df05b6e2d28f66544f5a8b41d1a7824
diff --git a/metadata/md5-cache/x11-libs/libxcvt-0.1.1 b/metadata/md5-cache/x11-libs/libxcvt-0.1.1
deleted file mode 100644
index 531d2d9a3b15..000000000000
--- a/metadata/md5-cache/x11-libs/libxcvt-0.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DESCRIPTION=X.Org xcvt library and cvt program
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libxcvt
-INHERIT=xorg-3 meson
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=!<x11-base/xorg-server-1.20.11-r3
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/libxcvt-0.1.1.tar.xz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=3eeeb4b4a2e6055d47599e4db1aa869b
diff --git a/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.3-r3 b/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.3-r3
deleted file mode 100644
index badfb4e71d2b..000000000000
--- a/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.3-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/gperf-3.0.1 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/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(-)?] >=x11-libs/xcb-util-image-0.3.9-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/xcb-util-renderutil-0.3.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-base/xcb-proto-1.8-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(-)?] x11-base/xorg-proto
-DESCRIPTION=X C-language Bindings sample implementations
-EAPI=7
-HOMEPAGE=https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor
-INHERIT=xorg-3
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris
-LICENSE=MIT
-RDEPEND=>=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(-)?] >=x11-libs/xcb-util-image-0.3.9-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/xcb-util-renderutil-0.3.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/xcb/xcb-util-cursor-0.1.3.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=4a17a80d2f031210b92fc26f739c9108
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 82f01acc092f..61083b5f9f46 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/compose-tables-1.7.5 b/metadata/md5-cache/x11-misc/compose-tables-1.7.5
deleted file mode 100644
index 2b55bad536b3..000000000000
--- a/metadata/md5-cache/x11-misc/compose-tables-1.7.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-proto >=x11-libs/libxcb-1.11.1 x11-libs/xtrans
-DESCRIPTION=X.Org Compose Key tables from libX11
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/compose-tables
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=MIT
-RDEPEND=!<x11-libs/libX11-1.7.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.7.5.tar.xz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=f0e1fae0250bebc667bd7d6e46f1a38a
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index e89eb790dc57..5d8a7dc1012c 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/mlterm-3.9.1-r2 b/metadata/md5-cache/x11-terms/mlterm-3.9.1-r2
deleted file mode 100644
index 3b382384dccc..000000000000
--- a/metadata/md5-cache/x11-terms/mlterm-3.9.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=virtual/libcrypt:= X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) bidi? ( dev-libs/fribidi ) brltty? ( app-accessibility/brltty ) cairo? ( x11-libs/cairo[X(+)] ) fbcon? ( media-fonts/unifont ) fcitx? ( app-i18n/fcitx ) freewnn? ( app-i18n/freewnn ) gtk? ( x11-libs/gtk+:3 ) harfbuzz? ( media-libs/harfbuzz[truetype(+)] ) ibus? ( app-i18n/ibus ) libssh2? ( net-libs/libssh2 ) m17n-lib? ( dev-libs/m17n-lib ) nls? ( virtual/libintl ) regis? ( || ( media-libs/sdl-ttf media-libs/sdl2-ttf ) ) scim? ( app-i18n/scim ) skk? ( || ( virtual/skkserv app-i18n/skk-jisyo ) ) uim? ( app-i18n/uim ) utempter? ( sys-libs/libutempter ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) xft? ( x11-libs/libXft ) virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=A multi-lingual terminal emulator
-EAPI=7
-HOMEPAGE=http://mlterm.sourceforge.net/
-INHERIT=desktop
-IUSE=+X bidi brltty cairo debug fbcon fcitx freewnn gtk harfbuzz ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter wayland xft
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=BSD
-RDEPEND=virtual/libcrypt:= X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) bidi? ( dev-libs/fribidi ) brltty? ( app-accessibility/brltty ) cairo? ( x11-libs/cairo[X(+)] ) fbcon? ( media-fonts/unifont ) fcitx? ( app-i18n/fcitx ) freewnn? ( app-i18n/freewnn ) gtk? ( x11-libs/gtk+:3 ) harfbuzz? ( media-libs/harfbuzz[truetype(+)] ) ibus? ( app-i18n/ibus ) libssh2? ( net-libs/libssh2 ) m17n-lib? ( dev-libs/m17n-lib ) nls? ( virtual/libintl ) regis? ( || ( media-libs/sdl-ttf media-libs/sdl2-ttf ) ) scim? ( app-i18n/scim ) skk? ( || ( virtual/skkserv app-i18n/skk-jisyo ) ) uim? ( app-i18n/uim ) utempter? ( sys-libs/libutempter ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) xft? ( x11-libs/libXft )
-REQUIRED_USE=|| ( X fbcon wayland )
-SLOT=0
-SRC_URI=mirror://sourceforge/mlterm/mlterm-3.9.1.tar.gz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa
-_md5_=ea025d3c0c78506cca02bbc4493f7d49
diff --git a/metadata/md5-cache/x11-terms/mlterm-3.9.2 b/metadata/md5-cache/x11-terms/mlterm-3.9.2
index d322103d41e4..3180ea1d3d08 100644
--- a/metadata/md5-cache/x11-terms/mlterm-3.9.2
+++ b/metadata/md5-cache/x11-terms/mlterm-3.9.2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=http://mlterm.sourceforge.net/
 INHERIT=desktop
 IUSE=+X bidi brltty cairo debug fbcon fcitx freewnn gtk harfbuzz ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter wayland xft
-KEYWORDS=amd64 ~ppc ppc64 ~riscv x86
+KEYWORDS=amd64 ppc ppc64 ~riscv x86
 LICENSE=BSD
 RDEPEND=virtual/libcrypt:= X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) bidi? ( dev-libs/fribidi ) brltty? ( app-accessibility/brltty ) cairo? ( x11-libs/cairo[X(+)] ) fbcon? ( media-fonts/unifont ) fcitx? ( app-i18n/fcitx ) freewnn? ( app-i18n/freewnn ) gtk? ( x11-libs/gtk+:3 ) harfbuzz? ( media-libs/harfbuzz[truetype(+)] ) ibus? ( app-i18n/ibus ) libssh2? ( net-libs/libssh2 ) m17n-lib? ( dev-libs/m17n-lib ) nls? ( virtual/libintl ) regis? ( || ( media-libs/sdl-ttf media-libs/sdl2-ttf ) ) scim? ( app-i18n/scim ) skk? ( || ( virtual/skkserv app-i18n/skk-jisyo ) ) uim? ( app-i18n/uim ) utempter? ( sys-libs/libutempter ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) xft? ( x11-libs/libXft )
 REQUIRED_USE=|| ( X fbcon wayland )
 SLOT=0
 SRC_URI=mirror://sourceforge/mlterm/mlterm-3.9.2.tar.gz
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa
-_md5_=b737bed660a495184017d4d5bd4f24f1
+_md5_=f4b9ff740aa6e4ab64084bc5704bd801
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 71b90099cae3..47310ddeb504 100644
--- a/metadata/md5-cache/x11-themes/Manifest.gz
+++ b/metadata/md5-cache/x11-themes/Manifest.gz
diff --git a/metadata/md5-cache/x11-themes/gentoo-xcursors-0.3.2-r1 b/metadata/md5-cache/x11-themes/gentoo-xcursors-0.3.2-r1
deleted file mode 100644
index c55264dba0bb..000000000000
--- a/metadata/md5-cache/x11-themes/gentoo-xcursors-0.3.2-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=A high quality set of animated mouse cursors
-EAPI=7
-HOMEPAGE=https://schlomp.space/tastytea/gentoo-xcursors
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libXcursor
-SLOT=0
-SRC_URI=https://schlomp.space/tastytea/gentoo-xcursors/archive/0.3.2.tar.gz -> gentoo-xcursors-0.3.2.tar.gz
-_md5_=1b82ebbd0c93f5d77bc49fd2a6286244
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index e7ad31fb2521..9eab8b57769f 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-08-18T00:39:48Z
+TIMESTAMP 2022-08-18T06:39:45Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL9ilRfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL93rFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCD1A/+KQxsw2u/m/d4DmLDCG4Cn8k4BLWV3e/scZpCcpGe7NaHvXnIbPXMMXsa
-3HLZZA63Nj6T/HveBLtawPk1MPxYKTSAtr9hPm4U6DsXFsMkih35TElR/OUaDAVS
-yZfwxUA0vGegV8wWn48FWENzGj06K3MN4lV0Gy53oECzFCnhwUdC6190psyBCWjJ
-I7H2x8SwHNQUiq/1jH2xd53RhpA0UbkC+M4WL+6bCAcE93fJ9KiTsNNlY6xBVcPC
-jglAkqFWzQKNmNvGr0wiulzJfWs3NrbVZhHghCqn5lgDIfW3V8E4Xd0jj0MsIuiE
-O4Lo0ZgFYVKiEijmy4XVVQZmXumvgknYfaVhzsoQRuBM4AiwEBPC8publeeknbwx
-crpmke8uE6cp1Nk1jd0cKFJ2o68UW+Huvf+Of3lLnUqyUu2Dr98r7W2cTjcju2nI
-KTFAafX1NNELvMcC9q+Anyxd1lPcqneRcZcaB8nv5xFclrP170/Dy6JUB16UyDfs
-RWJEhRAIk/YRtsAMo5JOa5QzQrXpKS8BMqNOUmFbvE6UMMq7IaGXGszA4WkYyEys
-S37YvrAGoNbUmdDq4p7sz1UflOVH0ffla8o/OaH+ZR/NQ2kSRMIKVGau2O2l30Kr
-RMZSo2Ja45mdiCB7XhjYKnJVgQtFpoXqFD0B6OEVlaXnoCH9JFY=
-=QfRb
+klCzFRAArtL4rkNUEuaSXz6ed+MfvZUslBNZcZQLFXEH/a5EQu4HP43IUshSdsJh
+lPs9rblvQsjWHL3f6vGugyKd3oQDbU2MdrtvqarZjHhKG3OeC/A4ahT66rmzxuY7
+KMgfRaEzRfwCeVkX7W0d0FLsDTSYg4pvpaO7VkgDfZcOuSckWaU6qZgMUf0GYWT5
+t8hBJ8NeOehlfri3OQf2D59ollIzZj1HJcM2ZKM08frJ3AKdDvHzFISM2ttotQp6
+fpm3ONmtVFFPY1TYDC5LW/1/Czez7RZ3d8UAt+grVsQeLFSWvfyapqXKoUge/jpa
+PuscC8zVmd3b4YztXFOLxHL6KjnYYvuui9mKAzB0msFq+cTCHe/WgTGeNua2ifGh
+V1sY2Lp7QDPe0srSZWBp9iq5zQEbh1KA16N1L/+I+Pzy+eVOZHsUWQvV2ZntV4j/
+mOeSTTSzXv+VWRr4N/tYMjOHF/D9aPYMKsXVpSLso/Ixsav15u6R8TuL/Tel0KwW
+lXpsqVr9Ldt+JY2sg0jcmPCVkpK1V7WfYQr6H2FY5rTwGzbj8gISiHsfphTd/Q1g
+L3ahsIOErJgtRH1qGWaPQxzdBUbyHZ2E80JWwTchfbaTpIergcjtLYmMVpw2XGbj
+yc0yxL2D+5IcTtFDEWzaFXK1vxt4FO5IGlZ4JrJ1qTAUwY60Q2s=
+=hYQ7
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 08b02ba847bb..68c4c65979b2 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 18 Aug 2022 00:39:45 +0000
+Thu, 18 Aug 2022 06:39:42 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index c082a84cbb3a..3c0507c3e97a 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Aug 18 12:39:44 AM UTC 2022
+Thu Aug 18 06:39:42 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 6bdc73936d80..d3fc8b79c268 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 18 Aug 2022 00:45:01 +0000
+Thu, 18 Aug 2022 06:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index fba463b25d6a..3fca65899aa5 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-174ae76957f2baae81aa0985d53c7037d0f5113c 1660782688 2022-08-18T00:31:28+00:00
+67b7b5d5a8e9895175d92798d924f28d4c7cc947 1660803522 2022-08-18T06:18:42+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 576f3592fce3..c78e5d25309a 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1660783201 Thu 18 Aug 2022 12:40:01 AM UTC
+1660804801 Thu 18 Aug 2022 06:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 18fe2bcfc4dc..68c4c65979b2 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 18 Aug 2022 00:39:44 +0000
+Thu, 18 Aug 2022 06:39:42 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 59ad877a5e45..c0ddc3d7b166 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 0389d29207e8..95efc60472ee 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -7,11 +7,13 @@ DIST wireshark-3.6.3.tar.xz 39935892 BLAKE2B 3b636867d946f0cf748eb719874e815c919
 DIST wireshark-3.6.5.tar.xz 39939340 BLAKE2B 4df1abce2563f20e91fac169ef1ab65851a5f63423aceba487db8cd4b954c4a2ba5673e032878b33a43992cb2ee4628899eee8b0065220cd0c79a8c98a589ef0 SHA512 9aa60721401fbd1f3c6b912312792433c9f8a09583cf684a4f1a24c839f4786a54a0abbfd88c04ba222e5a7af09f7bc67c292a0f944c9b717a71509655fe2fe5
 DIST wireshark-3.6.6.tar.xz 39950276 BLAKE2B cb74c4ed307b83ba509fa3b56356a33df11d9d1effb29054f73f248ca1c7107806676539d0802cc71e07687831a838145194104183afa4ae1825eb1fb85062b1 SHA512 c32d5aafb3091dc1475896a3c4cfcb5a47af002e53f011a65697271c611e690743153841f5db1021a6cbea6d427dc661dce7b85208832251200258fb46aad84b
 DIST wireshark-3.6.7.tar.xz 39967312 BLAKE2B 0539130aec2c7d8fdfec536114144a0b761addb8006d146a5e08d0a58e95d5d6b0db67ef32ceae4143de9836f25a3497802706f0a0eb633f29e1f24a47819e4b SHA512 caf087ee467bf934f28d096869ea3d9d7c5a3c83e51c4df447700096943a92abf5cf29f4956b9a549e0708bcb3515b55c4660a7ced2cb9dbc582b87550026fac
+DIST wireshark-4.0.0rc1.tar.xz 41291340 BLAKE2B 96dc9616702c67f47517cf5fc575bf555d5f7e83cc90284301e3ef26476ca6292f8aba3c7230c3ca7e6404a9b953861247a448826b339fa586d5a8206c787989 SHA512 16d4f3d39198bb208d4ad58059c38a40f21352186abf2cafb4140674d048e5bd29e5dbc079ed50f28f1dde150733bba6a26c6fc7d10e524e4556bd20c6ae2856
 EBUILD wireshark-3.4.11.ebuild 7457 BLAKE2B 05a0c93f8b8137ecb865ad4cc5f409685c79ce8dab0694e2d89b18bda7b8760e6162f5bdd4843fb8e5a21c69cfd62608b31fcb707636c8f6592c5664f64ccf55 SHA512 51cb14b1866282aa3bc83d697aaa999d1ab2a839fcf778483bd290f0366f9a105b5f2813c00f67779c1df60a443cfb7243176857e3ee5b91549447a941b75509
 EBUILD wireshark-3.6.2.ebuild 7258 BLAKE2B 32c295bd798526fa0c406e1662e8dc941e402c322696c7d9be524e21a4066b2671d94ffb9e1fe1df854869eab2e9c32c25cf2f43c3a512f2c25fa57af7a1fac7 SHA512 59fdf0864bf220784ced5496adc1bd15a6e0a6a992fedd1e3138e38221734b0a97c704b7dd750477990c3a81153878c7275c9486cae5b0fd2a38d06243119431
 EBUILD wireshark-3.6.3.ebuild 7088 BLAKE2B 739c59ec85023365cd17a6ed7e77f1d9a50a541bb19c53d2df6848895c0f7e21c9d76d72f2246dd1ca1df8a4fb32cda36349417140e054bd3064a62eb2b673c4 SHA512 c47811d1cb475de60906b2bff0f6423c0eb9a955dba9d4e7cf378022b028665c3d8e7c315ca5afc886f581a5f6dd450e65b976942e57d3d602f31e1863196d4f
 EBUILD wireshark-3.6.5.ebuild 7290 BLAKE2B 9488d17dfd2e7bb6b9664b75ef4f9cc35f3f8faba148701f9a376f43f7f5a01dba5dd145b8a3e822e85d2a2eecb6919b8906f7dca3268a61d85b5d1f204f3c0c SHA512 c97d5d8b388441536cd27ec737312cc0278f05947efb28a9d8a304350b84c103bf642b7668cadb476e599284ecb80c8bd80ade64af57e960cae3d0dde9458bed
 EBUILD wireshark-3.6.6.ebuild 7286 BLAKE2B b38c93d1d5e04baa2e2b93916f31c60b832a33e67772788c9ad32dce2fc389b95d5b4f502db4bcf91568e0e25d4c4583ec296788c256b9560f90d64d3e7e55b8 SHA512 998880fb8514364ec6d193a63a0a706075da934ae84e29e843fb6efab03eed829c4f3c97199999e1dec188f7845ba3a79196ef7b6b1df828c666f4dce945d31c
 EBUILD wireshark-3.6.7.ebuild 7290 BLAKE2B 9488d17dfd2e7bb6b9664b75ef4f9cc35f3f8faba148701f9a376f43f7f5a01dba5dd145b8a3e822e85d2a2eecb6919b8906f7dca3268a61d85b5d1f204f3c0c SHA512 c97d5d8b388441536cd27ec737312cc0278f05947efb28a9d8a304350b84c103bf642b7668cadb476e599284ecb80c8bd80ade64af57e960cae3d0dde9458bed
-EBUILD wireshark-9999.ebuild 7270 BLAKE2B 16cfb9618d7c251a1131ff1a1b8ceda2ff7975e8e4b8416e6835143e1387ed3d089287df9200416c1ed686eecfe7076564336d47b0d0dff671729782b74214cb SHA512 9d0d259670da93e2e0ecb15e8dc8d318a1d12093c948b86cbb9d51e96631b91841e807c4a8dec9111929c9b84e8c274730d7e3ddcacc2bd8e4eeb6fd7044b972
+EBUILD wireshark-4.0.0_rc1.ebuild 7562 BLAKE2B 68499bb98c9cf5d93ac2f988c8172218e2b632637c61aebc66c2b810460bc3e9f975647dd8f0cc487f64b8af1147eddbb5bd2e440c02c49edd711978502791a4 SHA512 0002179e482e10b92d7a938b4f8e37cdb2db8c7f07786aa90dd979714ac8b78f8d3434c2db6ec274011fcbe1b57a550bfa52ecf14edf168246810c17638723b2
+EBUILD wireshark-9999.ebuild 7562 BLAKE2B 68499bb98c9cf5d93ac2f988c8172218e2b632637c61aebc66c2b810460bc3e9f975647dd8f0cc487f64b8af1147eddbb5bd2e440c02c49edd711978502791a4 SHA512 0002179e482e10b92d7a938b4f8e37cdb2db8c7f07786aa90dd979714ac8b78f8d3434c2db6ec274011fcbe1b57a550bfa52ecf14edf168246810c17638723b2
 MISC metadata.xml 5367 BLAKE2B ee72f812b3ed20e960ca3499fbe3b1e8a38e0ec7635d99b55a1d38f7f147f179a749a5d9fe1bdfdf0b7376437338b6fa8b0cb7b71cda011f863252a5e0233658 SHA512 97d9c715c030ba494a856e9aa3247a87904c305ee7909bc1bcf59b3726fad8ea5184a95d5809070c555690f928b9c89083497e01c6d2fed23c88500d56c94960
diff --git a/net-analyzer/wireshark/wireshark-4.0.0_rc1.ebuild b/net-analyzer/wireshark/wireshark-4.0.0_rc1.ebuild
new file mode 100644
index 000000000000..0bdf2a0c919a
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-4.0.0_rc1.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/"
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark"
+	inherit git-r3
+else
+	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
+	S="${WORKDIR}/${P/_/}"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+	fi
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon"
+IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
+IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt"
+IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
+IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	plugin-ifdemo? ( plugins )"
+
+RESTRICT="!test? ( test )"
+
+# TODO: wifidump/libssh automagic?
+# bug #753062 for speexdsp
+RDEPEND="acct-group/pcap
+	>=dev-libs/glib-2.50.0:2
+	dev-libs/libpcre2
+	>=net-dns/c-ares-1.14.0:=
+	>=dev-libs/libgcrypt-1.8.0:=
+	media-libs/speexdsp
+	bcg729? ( media-libs/bcg729 )
+	brotli? ( app-arch/brotli:= )
+	ciscodump? ( >=net-libs/libssh-0.6 )
+	filecaps? ( sys-libs/libcap )
+	http2? ( >=net-libs/nghttp2-1.11.0:= )
+	ilbc? ( media-libs/libilbc )
+	kerberos? ( virtual/krb5 )
+	libxml2? ( dev-libs/libxml2 )
+	lua? ( ${LUA_DEPS} )
+	lz4? ( app-arch/lz4:= )
+	maxminddb? ( dev-libs/libmaxminddb:= )
+	minizip? ( sys-libs/zlib[minizip] )
+	netlink? ( dev-libs/libnl:3 )
+	opus? ( media-libs/opus )
+	pcap? ( net-libs/libpcap )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	sdjournal? ( sys-apps/systemd )
+	smi? ( net-libs/libsmi )
+	snappy? ( app-arch/snappy )
+	spandsp? ( media-libs/spandsp )
+	sshdump? ( >=net-libs/libssh-0.6 )
+	ssl? ( >=net-libs/gnutls-3.5.8:= )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd:= )"
+DEPEND="${RDEPEND}"
+# TODO: 4.0.0_rc1 release notes say:
+# "Perl is no longer required to build Wireshark, but may be required to build some source code files and run code analysis checks."
+BDEPEND="${PYTHON_DEPS}
+	dev-lang/perl
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-ruby/asciidoctor
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+	test? (
+		$(python_gen_any_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		')
+	)"
+RDEPEND="${RDEPEND}
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+	"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
+)
+
+python_check_deps() {
+	use test || return 0
+
+	python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" &&
+		 python_has_version -b "dev-python/pytest-xdist[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs
+
+	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
+	if use kerberos ; then
+		case $(krb5-config --libs) in
+			*-lcrypto*)
+				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+				ewarn "license and the GPL, so do your check before distributing such package."
+				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
+				;;
+		esac
+	fi
+
+	if use qt5 ; then
+		#export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	python_setup
+
+	mycmakeargs+=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
+		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
+		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
+		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
+		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
+		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
+		-DBUILD_androiddump=$(usex androiddump)
+		-DBUILD_capinfos=$(usex capinfos)
+		-DBUILD_captype=$(usex captype)
+		-DBUILD_ciscodump=$(usex ciscodump)
+		-DBUILD_dftest=$(usex dftest)
+		-DBUILD_dpauxmon=$(usex dpauxmon)
+		-DBUILD_dumpcap=$(usex dumpcap)
+		-DBUILD_editcap=$(usex editcap)
+		-DBUILD_mergecap=$(usex mergecap)
+		-DBUILD_mmdbresolve=$(usex maxminddb)
+		-DBUILD_randpkt=$(usex randpkt)
+		-DBUILD_randpktdump=$(usex randpktdump)
+		-DBUILD_reordercap=$(usex reordercap)
+		-DBUILD_sdjournal=$(usex sdjournal)
+		-DBUILD_sharkd=$(usex sharkd)
+		-DBUILD_sshdump=$(usex sshdump)
+		-DBUILD_text2pcap=$(usex text2pcap)
+		-DBUILD_tfshark=$(usex tfshark)
+		-DBUILD_tshark=$(usex tshark)
+		-DBUILD_udpdump=$(usex udpdump)
+		-DBUILD_wireshark=$(usex qt5)
+		-DENABLE_WERROR=OFF
+		-DENABLE_BCG729=$(usex bcg729)
+		-DENABLE_BROTLI=$(usex brotli)
+		-DENABLE_CAP=$(usex filecaps caps)
+		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_ILBC=$(usex ilbc)
+		-DENABLE_KERBEROS=$(usex kerberos)
+		-DENABLE_LIBXML2=$(usex libxml2)
+		-DENABLE_LTO=$(usex lto)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_LZ4=$(usex lz4)
+		-DENABLE_MINIZIP=$(usex minizip)
+		-DENABLE_NETLINK=$(usex netlink)
+		-DENABLE_NGHTTP2=$(usex http2)
+		-DENABLE_OPUS=$(usex opus)
+		-DENABLE_PCAP=$(usex pcap)
+		-DENABLE_PLUGINS=$(usex plugins)
+		-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
+		-DENABLE_SBC=$(usex sbc)
+		-DENABLE_SMI=$(usex smi)
+		-DENABLE_SNAPPY=$(usex snappy)
+		-DENABLE_SPANDSP=$(usex spandsp)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_ZSTD=$(usex zstd)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build test-programs
+
+	# https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html
+	epytest \
+		--disable-capture \
+		--skip-missing-programs=all \
+		--program-path "${BUILD_DIR}"/run
+}
+
+src_install() {
+	cmake_src_install
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
+
+	# install headers
+	insinto /usr/include/wireshark
+	doins "${BUILD_DIR}"/config.h
+
+	# If trying to remove this, try build e.g. libvirt first!
+	# At last check, Fedora is still doing this too.
+	local dir dirs=(
+		epan
+		epan/crypt
+		epan/dfilter
+		epan/dissectors
+		epan/ftypes
+		wiretap
+		wsutil
+		wsutil/wmem
+	)
+
+	for dir in "${dirs[@]}" ; do
+		insinto /usr/include/wireshark/${dir}
+		doins ${dir}/*.h
+	done
+
+	if use qt5 ; then
+		local s
+
+		for s in 16 32 48 64 128 256 512 1024 ; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/apps
+			newins resources/icons/wsicon${s}.png wireshark.png
+		done
+
+		for s in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
+			newins resources/icons//WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
+		done
+	fi
+
+	if [[ -d "${ED}"/usr/share/appdata ]] ; then
+		rm -r "${ED}"/usr/share/appdata || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	# Add group for users allowed to sniff.
+	chgrp pcap "${EROOT}"/usr/bin/dumpcap
+
+	if use dumpcap && use pcap ; then
+		fcaps -o 0 -g pcap -m 4710 -M 0710 \
+			cap_dac_read_search,cap_net_raw,cap_net_admin \
+			"${EROOT}"/usr/bin/dumpcap
+	fi
+
+	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+	ewarn "add yourself to the pcap group. This security measure ensures"
+	ewarn "that only trusted users are allowed to sniff your traffic."
+}
diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild
index 68dc99e8c15c..0bdf2a0c919a 100644
--- a/net-analyzer/wireshark/wireshark-9999.ebuild
+++ b/net-analyzer/wireshark/wireshark-9999.ebuild
@@ -18,7 +18,9 @@ else
 	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
 	S="${WORKDIR}/${P/_/}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+	fi
 fi
 
 LICENSE="GPL-2"
@@ -34,17 +36,19 @@ REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
 
 RESTRICT="!test? ( test )"
 
+# TODO: wifidump/libssh automagic?
 # bug #753062 for speexdsp
 RDEPEND="acct-group/pcap
-	>=dev-libs/glib-2.38:2
-	>=net-dns/c-ares-1.5:=
-	dev-libs/libgcrypt:=
+	>=dev-libs/glib-2.50.0:2
+	dev-libs/libpcre2
+	>=net-dns/c-ares-1.14.0:=
+	>=dev-libs/libgcrypt-1.8.0:=
 	media-libs/speexdsp
 	bcg729? ( media-libs/bcg729 )
 	brotli? ( app-arch/brotli:= )
 	ciscodump? ( >=net-libs/libssh-0.6 )
 	filecaps? ( sys-libs/libcap )
-	http2? ( net-libs/nghttp2:= )
+	http2? ( >=net-libs/nghttp2-1.11.0:= )
 	ilbc? ( media-libs/libilbc )
 	kerberos? ( virtual/krb5 )
 	libxml2? ( dev-libs/libxml2 )
@@ -69,10 +73,12 @@ RDEPEND="acct-group/pcap
 	snappy? ( app-arch/snappy )
 	spandsp? ( media-libs/spandsp )
 	sshdump? ( >=net-libs/libssh-0.6 )
-	ssl? ( net-libs/gnutls:= )
+	ssl? ( >=net-libs/gnutls-3.5.8:= )
 	zlib? ( sys-libs/zlib )
 	zstd? ( app-arch/zstd:= )"
 DEPEND="${RDEPEND}"
+# TODO: 4.0.0_rc1 release notes say:
+# "Perl is no longer required to build Wireshark, but may be required to build some source code files and run code analysis checks."
 BDEPEND="${PYTHON_DEPS}
 	dev-lang/perl
 	sys-devel/flex
@@ -130,7 +136,7 @@ src_configure() {
 	fi
 
 	if use qt5 ; then
-		export QT_MIN_VERSION=5.3.0
+		#export QT_MIN_VERSION=5.3.0
 		append-cxxflags -fPIC -DPIC
 	fi
 
@@ -164,7 +170,7 @@ src_configure() {
 		-DBUILD_tshark=$(usex tshark)
 		-DBUILD_udpdump=$(usex udpdump)
 		-DBUILD_wireshark=$(usex qt5)
-		-DDISABLE_WERROR=ON
+		-DENABLE_WERROR=OFF
 		-DENABLE_BCG729=$(usex bcg729)
 		-DENABLE_BROTLI=$(usex brotli)
 		-DENABLE_CAP=$(usex filecaps caps)
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 5cba9aaac535..081cb19a38ad 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 00c12ba4e732..0892c74b30eb 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -3,8 +3,10 @@ DIST bind-9.16.27.tar.xz 5084340 BLAKE2B 37b49ce81aa5122493a4feb2bb7be53c5d46ff2
 DIST bind-9.16.29.tar.xz 5088348 BLAKE2B 17ee1443926327c30f1d5820110b01a193c53eb24e23385b713217a4e49d9c2b5ddb6e1c49cb80d2c9083c71ce7872a26fe3597209f2e3215e6cc7e930e68004 SHA512 b4acbafed370438ac53e73468ccb5ea5745a1c8f764dd96f9c9a027594a3b7ce0d486e7f01138b39795b456265e0e6116cd76e44f5a3329687cd718550ca79fb
 DIST bind-9.16.30.tar.xz 5086288 BLAKE2B 35fe14b58a018df25563e58a9632b4431f740bc7a708eb823117541548d23b1855e43058cf7323361ca904d5e59d687e282abb73dc8b617e4eb25ef113168e93 SHA512 cc9bcbedf63c2efe0a23f14db3e57fdae46f0509aac58e5840a6805ce4fbd76cad5bfde4d461442adb88c4d947f8d79bf979aeb24aeb9303b6adc8d169b7118c
 DIST bind-9.16.31.tar.xz 5087424 BLAKE2B 75c9038c00fe289161a15a8e4fdadaef5a6a7f3ca03068ec24e82aa9f30ac82d0ded9cf73df83219058cd81b198ea8f561211a323e31b41407294f6932dc61d3 SHA512 8577b4d021a5a763b8669d59ef6c3499238e87657ca94ccfc530cb9a7a215ee3682002aa6141f5731154cbc43e0e6094372961468811a68bbd2a37e20e287c7e
+DIST bind-9.16.32.tar.xz 5091860 BLAKE2B df6f2c878138015da580dfaf0e16b5a97b11ead9f99c1425a09da8484954196ea3dafb828ac3ab386200ce2b180646c7eb1e0e62a84c153162270a4a1e19a5fc SHA512 99abedf055901b43e1a85c448ee4c2dd731b7ab77de1454b73c8f9df816aa32262e70e23a8112959d94be990fd4f1c48c36611657ba745670141a7447fd53316
 EBUILD bind-tools-9.16.27.ebuild 3620 BLAKE2B 43fe2108014829574d1e4d4d88b80237690d26592f61b859d38dda0fe4212da02e5b6959cde406aa9b9a42b253512f56d9b4de36f23ed5dc4207c849766853d4 SHA512 b94d4fb99a74d7c55852102bf07113c5ba4b8646db505eda7c0acc94887a3b1390b0c9dc4c9f3f7e3ba9982c815f58867ce2af38e20ab20669f46e69768a8136
 EBUILD bind-tools-9.16.29-r1.ebuild 3683 BLAKE2B 2aee3c3b29e76fe6d40e8e48dd6fa005b5d72a159723390f9ee8f3a15c76df888c59d98830db3890b644d424763496c02214f778f7c5932ab1dc7175d625eb2e SHA512 828bbc48a9b921d86108bbe41fcb9079cbd1761fa7fb2877662594c16f409cf31d213e4490e4443ca245ec4dd5a17e239d9e63b1f21f34feaabe34f86f9f91ab
 EBUILD bind-tools-9.16.30.ebuild 3696 BLAKE2B b067eb1c1306702885c5fd9ee57bc581dea3265d03bb25fba1e0a894ca96c3070701a920fa9d60015abea2711aeb035567ab8d51855a047d72d7ddfddecf2f33 SHA512 869e44265550543c6e7e52f57a73866f00af3f10c0e5815d465d7d62e80ef88e6ef0e59ba1132b50a32edb2ac75a107e81fa5ecdd05f59ff98ee4ab75ae9f862
 EBUILD bind-tools-9.16.31.ebuild 3778 BLAKE2B cfb5390dc44054ce7406b4144e1f0d01156c24edc0317247faa3d0dac03767c4436a2b23b3c39d74fc0e5a30b897160c7a54ffe8d49f63dc916c15cfa394aa1c SHA512 0b84e8d119bffe95c4d4aafcb933ab487768e50e730743ee6e1e951985dea136e41795d547e9b24aad60fdbed168c66d2c60ac7884d11fb317d28a7f38429dac
+EBUILD bind-tools-9.16.32.ebuild 3778 BLAKE2B cfb5390dc44054ce7406b4144e1f0d01156c24edc0317247faa3d0dac03767c4436a2b23b3c39d74fc0e5a30b897160c7a54ffe8d49f63dc916c15cfa394aa1c SHA512 0b84e8d119bffe95c4d4aafcb933ab487768e50e730743ee6e1e951985dea136e41795d547e9b24aad60fdbed168c66d2c60ac7884d11fb317d28a7f38429dac
 MISC metadata.xml 424 BLAKE2B cb17be35f118db8adb22f75f4b52fce963eb58b7c502cb090fb8ca7a269820e85f77aaa63a880b42f319482000ef43fff82f77c61ed68cb4e21180c2bae66db6 SHA512 a39b3205586616deb59191c2b9d3251cc424e3184f0ff98b0db3251732d96b45d8e6c37e59116917ee17c51b37a048457031b3504329472f0033e360fbd56b1a
diff --git a/net-dns/bind-tools/bind-tools-9.16.32.ebuild b/net-dns/bind-tools/bind-tools-9.16.32.ebuild
new file mode 100644
index 000000000000..4a9cc94b8e64
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.16.32.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic multiprocessing toolchain-funcs
+
+MY_PN=${PN//-tools}
+MY_PV=${PV/_p/-P}
+MY_PV=${MY_PV/_rc/rc}
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
+HOMEPAGE="https://www.isc.org/software/bind https://gitlab.isc.org/isc-projects/bind9"
+SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+caps doc gssapi idn libedit readline test xml"
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug #409687
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/libuv:=
+	dev-libs/openssl:=
+	caps? ( sys-libs/libcap )
+	xml? ( dev-libs/libxml2 )
+	idn? ( net-dns/libidn2:= )
+	gssapi? ( virtual/krb5 )
+	libedit? ( dev-libs/libedit )
+	!libedit? (
+		readline? ( sys-libs/readline:= )
+	)
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+# sphinx required for man-page and html creation
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+	test? (
+		dev-util/cmocka
+		dev-util/kyua
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)"
+
+	# Do not disable thread local storage on Solaris, it works with our
+	# toolchain, and it breaks further configure checks
+	sed -i -e '/LDFLAGS=/s/-zrelax=transtls//' configure.ac configure || die
+
+	# bug #220361
+	rm aclocal.m4 || die
+	rm -rf libtool.m4/ || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir="${EPREFIX}"/var
+		--without-python
+		--without-libjson
+		--without-zlib
+		--without-lmdb
+		--without-maxminddb
+		--disable-geoip
+		--with-openssl="${ESYSROOT}"/usr
+		$(use_with idn libidn2 "${ESYSROOT}"/usr)
+		$(use_with xml libxml2)
+		$(use_with gssapi)
+		$(use_with readline)
+		$(use_enable caps linux-caps)
+		AR="$(type -P $(tc-getAR))"
+	)
+
+	# bug 607400
+	if use libedit ; then
+		myeconfargs+=( --with-readline=-ledit )
+	elif use readline ; then
+		myeconfargs+=( --with-readline=-lreadline )
+	else
+		myeconfargs+=( --without-readline )
+	fi
+
+	# bug #344029
+	append-cflags "-DDIG_SIGCHASE"
+
+	# to expose CMSG_* macros from sys/sockets.h
+	[[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600"
+
+	# localstatedir for nsupdate -l, bug #395785
+	tc-export BUILD_CC
+	econf "${myeconfargs[@]}"
+
+	# bug #151839
+	echo '#undef SO_BSDCOMPAT' >> config.h || die
+}
+
+src_compile() {
+	local AR="$(tc-getAR)"
+
+	emake AR="${AR}" -C lib/
+	emake AR="${AR}" -C bin/delv/
+	emake AR="${AR}" -C bin/dig/
+	emake AR="${AR}" -C bin/nsupdate/
+	emake AR="${AR}" -C bin/dnssec/
+	emake -C doc/man/ man $(usev doc)
+}
+
+src_test() {
+	# system tests ('emake test') require network configuration for IPs etc
+	# so we run the unit tests instead.
+	TEST_PARALLEL_JOBS="$(makeopts_jobs)" emake unit
+}
+
+src_install() {
+	local man_dir="${S}/doc/man"
+	local html_dir="${man_dir}/_build/html"
+
+	dodoc README CHANGES
+
+	cd "${S}"/bin/delv || die
+	dobin delv
+	doman ${man_dir}/delv.1
+
+	cd "${S}"/bin/dig || die
+	dobin dig host nslookup
+	doman ${man_dir}/{dig,host,nslookup}.1
+
+	cd "${S}"/bin/nsupdate || die
+	dobin nsupdate
+	doman ${man_dir}/nsupdate.1
+	if use doc; then
+		docinto html
+		dodoc ${html_dir}/nsupdate.html
+	fi
+
+	cd "${S}"/bin/dnssec || die
+	for tool in dsfromkey importkey keyfromlabel keygen \
+		revoke settime signzone verify; do
+		dobin dnssec-"${tool}"
+		doman ${man_dir}/dnssec-"${tool}".8
+		if use doc; then
+			docinto html
+			dodoc ${html_dir}/dnssec-"${tool}".html
+		fi
+	done
+}
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 19bad94166df..f70a2d03b046 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -13,10 +13,12 @@ DIST bind-9.16.27.tar.xz 5084340 BLAKE2B 37b49ce81aa5122493a4feb2bb7be53c5d46ff2
 DIST bind-9.16.29.tar.xz 5088348 BLAKE2B 17ee1443926327c30f1d5820110b01a193c53eb24e23385b713217a4e49d9c2b5ddb6e1c49cb80d2c9083c71ce7872a26fe3597209f2e3215e6cc7e930e68004 SHA512 b4acbafed370438ac53e73468ccb5ea5745a1c8f764dd96f9c9a027594a3b7ce0d486e7f01138b39795b456265e0e6116cd76e44f5a3329687cd718550ca79fb
 DIST bind-9.16.30.tar.xz 5086288 BLAKE2B 35fe14b58a018df25563e58a9632b4431f740bc7a708eb823117541548d23b1855e43058cf7323361ca904d5e59d687e282abb73dc8b617e4eb25ef113168e93 SHA512 cc9bcbedf63c2efe0a23f14db3e57fdae46f0509aac58e5840a6805ce4fbd76cad5bfde4d461442adb88c4d947f8d79bf979aeb24aeb9303b6adc8d169b7118c
 DIST bind-9.16.31.tar.xz 5087424 BLAKE2B 75c9038c00fe289161a15a8e4fdadaef5a6a7f3ca03068ec24e82aa9f30ac82d0ded9cf73df83219058cd81b198ea8f561211a323e31b41407294f6932dc61d3 SHA512 8577b4d021a5a763b8669d59ef6c3499238e87657ca94ccfc530cb9a7a215ee3682002aa6141f5731154cbc43e0e6094372961468811a68bbd2a37e20e287c7e
+DIST bind-9.16.32.tar.xz 5091860 BLAKE2B df6f2c878138015da580dfaf0e16b5a97b11ead9f99c1425a09da8484954196ea3dafb828ac3ab386200ce2b180646c7eb1e0e62a84c153162270a4a1e19a5fc SHA512 99abedf055901b43e1a85c448ee4c2dd731b7ab77de1454b73c8f9df816aa32262e70e23a8112959d94be990fd4f1c48c36611657ba745670141a7447fd53316
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
 EBUILD bind-9.16.27-r1.ebuild 11074 BLAKE2B 282aec1d9c3a12071c43af886b510ef60c28709f724a4c783b0c5ff03df3c9cdb7b9da19f161809b1f8b9fc75b608bf3bfe869cd3aca53b818f8cb418bf42685 SHA512 ee511e1132f571facebeb4b1c789492a6a5bc742ce2cb5dc87dcc245c94f0cf30ebe93a4139b70b6ec90198e26861d4f4865cb479ef84f6d90c0abb5f7eacd72
 EBUILD bind-9.16.29-r1.ebuild 11123 BLAKE2B 7efb5c669fcaca43ba36a4181af8981be7da21c298061b91e97af58d98011f4adde09d03304a0d72b3bf9feca1778ecc1993d0f35681d59be1c1d9c1e6093d7f SHA512 48ec83045b142ded0f406e5378e32bde337779f4339570aba5a9ca7c47d96c6060d5e09b7af82ab02b9ce0b18eb22cc2742bc4c7709b49562b3a94437f3d9ead
 EBUILD bind-9.16.29.ebuild 11080 BLAKE2B 52373acbad864b16fef7f13313c22a43de2f78d9dbb46ec1a9f6bdc28be01f7374dfc85964354ad19b9ed235a5dd46f55812d8e374260790e1e15d860c6822a1 SHA512 c65e350627f81caa87f1cddfa27feab221ae3726e49286d75db5f26fd3222bfb1d7225470a7a49862476edc04ddd9afb4bbfd9bade9121e60253a9cb7b71f7de
 EBUILD bind-9.16.30.ebuild 11094 BLAKE2B 06b8d0a792b7407dd167fa26048552ea402db49d3845fcd67667f0519ce0ac1fbae7a6152c61d3d3146ded4e51d4a270db06d5536cc9d9999f740d1ab65f5319 SHA512 156b65ec8ee2a95e8ea2cc9caba6bc0b23a099e2c2424ece8cd56f8266361e831cb60c30a12102c3d4bcd7ff9de48076c758001cdfdede00d19ad1995b9e3f7e
 EBUILD bind-9.16.31.ebuild 11180 BLAKE2B 09be31b3fd73dddf6eae0d0c00549371b6a3fd50c86a861a07d04c3565efb6fe1a39105054c46f20120d707fe86069a468ef10a82d62bcb957850eb6d2a1a5fc SHA512 cf3c26fcce13702d34ca40f8b60564972c09f8523e86b870fddabb55fd2f7a976a4a74634c219cafb09b8a0e704e00fd44a7f38871fd4c7f964a309a5b83d8ba
+EBUILD bind-9.16.32.ebuild 11180 BLAKE2B 09be31b3fd73dddf6eae0d0c00549371b6a3fd50c86a861a07d04c3565efb6fe1a39105054c46f20120d707fe86069a468ef10a82d62bcb957850eb6d2a1a5fc SHA512 cf3c26fcce13702d34ca40f8b60564972c09f8523e86b870fddabb55fd2f7a976a4a74634c219cafb09b8a0e704e00fd44a7f38871fd4c7f964a309a5b83d8ba
 MISC metadata.xml 974 BLAKE2B a2d3d119e1632c8c5565f0bdedd807c7eaab97f721c34e585ed19483db9b9e25ef364d1950d416acf1c7342cef8d763357c3a4e464b0704013e4a4b66788e6c7 SHA512 0255ae6a504d4f36fb7fe8b14b25328810bc500f610b4dcdb04a79d34a3dcb0ea8eb0a2298c1f69679d8679d89125cb34fc46be2897dbcb408827d718a9eb9d1
diff --git a/net-dns/bind/bind-9.16.32.ebuild b/net-dns/bind/bind-9.16.32.ebuild
new file mode 100644
index 000000000000..010d5b56b5d2
--- /dev/null
+++ b/net-dns/bind/bind-9.16.32.ebuild
@@ -0,0 +1,382 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Re dlz/mysql and threads, needs to be verified..
+# MySQL uses thread local storage in its C api. Thus MySQL
+# requires that each thread of an application execute a MySQL
+# thread initialization to setup the thread local storage.
+# This is impossible to do safely while staying within the DLZ
+# driver API. This is a limitation caused by MySQL, and not the DLZ API.
+# Because of this BIND MUST only run with a single thread when
+# using the MySQL driver.
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit python-r1 autotools multiprocessing toolchain-funcs flag-o-matic db-use systemd tmpfiles
+
+MY_PV="${PV/_p/-P}"
+MY_PV="${MY_PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SDB_LDAP_VER="1.1.0-fc14"
+
+RRL_PV="${MY_PV}"
+
+# SDB-LDAP: http://bind9-ldap.bayour.com/
+
+DESCRIPTION="Berkeley Internet Name Domain - Name Server"
+HOMEPAGE="https://www.isc.org/software/bind https://gitlab.isc.org/isc-projects/bind9"
+SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz
+	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+# -berkdb by default re bug #602682
+IUSE="berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi
+json ldap lmdb mysql odbc postgres python selinux static-libs test xml +zlib"
+# sdb-ldap - patch broken
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
+RESTRICT="!test? ( test )"
+
+# Upstream dropped the old geoip library, but the BIND configuration for using
+# GeoIP remained the same.
+REQUIRED_USE="
+	postgres? ( dlz )
+	berkdb? ( dlz )
+	mysql? ( dlz )
+	odbc? ( dlz )
+	ldap? ( dlz )
+	dnsrps? ( dlz )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+DEPEND="
+	acct-group/named
+	acct-user/named
+	berkdb? ( sys-libs/db:= )
+	dev-libs/openssl:=[-bindist(-)]
+	mysql? ( dev-db/mysql-connector-c:0= )
+	odbc? ( >=dev-db/unixODBC-2.2.6 )
+	ldap? ( net-nds/openldap:= )
+	postgres? ( dev-db/postgresql:= )
+	caps? ( >=sys-libs/libcap-2.1.0 )
+	xml? ( dev-libs/libxml2 )
+	geoip? ( dev-libs/libmaxminddb:= )
+	geoip2? ( dev-libs/libmaxminddb:= )
+	gssapi? ( virtual/krb5 )
+	json? ( dev-libs/json-c:= )
+	lmdb? ( dev-db/lmdb:= )
+	zlib? ( sys-libs/zlib )
+	dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/ply[${PYTHON_USEDEP}]
+	)
+	dev-libs/libuv:=
+"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-bind )
+	sys-process/psmisc"
+
+BDEPEND="
+	test? (
+		dev-util/cmocka
+		dev-util/kyua
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/ldap-library-path-on-multilib-machines.patch"
+)
+
+src_prepare() {
+	default
+
+	# Should be installed by bind-tools
+	sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die
+
+	# bug #220361
+	rm aclocal.m4 || die
+	rm -rf libtool.m4/ || die
+	eautoreconf
+
+	use python && python_copy_sources
+}
+
+src_configure() {
+	bind_configure --without-python
+	use python && python_foreach_impl python_configure
+}
+
+bind_configure() {
+	local myeconfargs=(
+		AR="$(type -P $(tc-getAR))"
+		--prefix="${EPREFIX}"/usr
+		--sysconfdir=/etc/bind
+		--localstatedir=/var
+		--with-libtool
+		--enable-full-report
+		--without-readline
+		--with-openssl="${ESYSROOT}"/usr
+		$(use_with test cmocka)
+		# Removed in 9.17, drags in libunwind dependency too
+		--disable-backtrace
+		$(use_enable caps linux-caps)
+		$(use_enable dnsrps)
+		$(use_enable dnstap)
+		$(use_enable fixed-rrset)
+		$(use_with berkdb dlz-bdb "${ESYSROOT}"/usr)
+		$(use_with dlz dlopen)
+		$(use_with dlz dlz-filesystem)
+		$(use_with dlz dlz-stub)
+		$(use_with gssapi)
+		$(use_with json json-c)
+		$(use_with ldap dlz-ldap)
+		$(use_with mysql dlz-mysql)
+		$(use_with odbc dlz-odbc)
+		$(use_with postgres dlz-postgres)
+		$(use_with lmdb)
+		$(use_with xml libxml2)
+		$(use_with zlib)
+		"${@}"
+	)
+
+	# This is for users to start to migrate back to USE=geoip, rather than
+	# USE=geoip2
+	if use geoip ; then
+		myeconfargs+=( $(use_with geoip maxminddb) --enable-geoip )
+	elif use geoip2 ; then
+		# Added 2020/09/30
+		# Remove USE=geoip2 support after 2020/03/01
+		ewarn "USE=geoip2 is deprecated; update your USE flags!"
+		myeconfargs+=( $(use_with geoip2 maxminddb) --enable-geoip )
+	else
+		myeconfargs+=( --without-maxminddb --disable-geoip )
+	fi
+
+	# bug #158664
+	#gcc-specs-ssp && replace-flags -O[23s] -O
+
+	# To include db.h from proper path
+	use berkdb && append-flags "-I$(db_includedir)"
+
+	export BUILD_CC=$(tc-getBUILD_CC)
+	econf "${myeconfargs[@]}"
+
+	# bug #151839
+	echo '#undef SO_BSDCOMPAT' >> config.h || die
+}
+
+python_configure() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	bind_configure --with-python
+	popd >/dev/null || die
+}
+
+src_compile() {
+	default
+	use python && python_foreach_impl python_compile
+}
+
+python_compile() {
+	pushd "${BUILD_DIR}"/bin/python >/dev/null || die
+	emake
+	popd >/dev/null || die
+}
+
+src_test() {
+	# system tests ('emake test') require network configuration for IPs etc
+	# so we run the unit tests instead.
+	TEST_PARALLEL_JOBS="$(makeopts_jobs)" emake unit
+}
+
+src_install() {
+	default
+
+	dodoc CHANGES README
+
+	if use doc; then
+		docinto misc
+		dodoc -r doc/misc/
+
+		# might a 'html' useflag make sense?
+		docinto html
+		dodoc -r doc/arm/
+
+		docinto contrib
+		dodoc contrib/scripts/{nanny.pl,named-bootconf.sh}
+
+		# some handy-dandy dynamic dns examples
+		pushd "${ED}"/usr/share/doc/${PF} 1>/dev/null || die
+		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
+		popd 1>/dev/null || die
+	fi
+
+	insinto /etc/bind
+	newins "${FILESDIR}"/named.conf-r8 named.conf
+
+	# ftp://ftp.rs.internic.net/domain/named.cache:
+	insinto /var/bind
+	newins "${FILESDIR}"/named.cache-r3 named.cache
+
+	insinto /var/bind/pri
+	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
+
+	newinitd "${FILESDIR}"/named.init-r14 named
+	newconfd "${FILESDIR}"/named.confd-r7 named
+
+	newenvd "${FILESDIR}"/10bind.env 10bind
+
+	# Let's get rid of those tools and their manpages since they're provided by bind-tools
+	rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup,delv,nsupdate}.1* || die
+	rm -f "${ED}"/usr/share/man/man8/nsupdate.8* || die
+	rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate} || die
+	rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate} || die
+	for tool in dsfromkey importkey keyfromlabel keygen \
+	revoke settime signzone verify; do
+		rm -f "${ED}"/usr/{,s}bin/dnssec-"${tool}" || die
+		rm -f "${ED}"/usr/share/man/man8/dnssec-"${tool}".8* || die
+	done
+
+	# bug 405251, library archives aren't properly handled by --enable/disable-static
+	if ! use static-libs; then
+		find "${ED}" -type f -name '*.a' -delete || die
+	fi
+
+	# bug 405251
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	use python && python_foreach_impl python_install
+
+	# bug 450406
+	dosym named.cache /var/bind/root.cache
+
+	dosym ../../var/bind/pri /etc/bind/pri
+	dosym ../../var/bind/sec /etc/bind/sec
+	dosym ../../var/bind/dyn /etc/bind/dyn
+	keepdir /var/bind/{pri,sec,dyn} /var/log/named
+
+	fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
+	fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+	fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+	fperms 0750 /etc/bind /var/bind/pri
+	fperms 0770 /var/log/named /var/bind/{,sec,dyn}
+
+	systemd_newunit "${FILESDIR}/named.service-r1" named.service
+	dotmpfiles "${FILESDIR}"/named.conf
+	exeinto /usr/libexec
+	doexe "${FILESDIR}/generate-rndc-key.sh"
+}
+
+python_install() {
+	pushd "${BUILD_DIR}"/bin/python >/dev/null || die
+	emake DESTDIR="${D}" install
+	python_scriptinto /usr/sbin
+	python_doscript dnssec-{checkds,coverage}
+	python_optimize
+	popd >/dev/null || die
+}
+
+pkg_postinst() {
+	tmpfiles_process named.conf
+
+	if [[ ! -f '/etc/bind/rndc.key' && ! -f '/etc/bind/rndc.conf' ]]; then
+		einfo "Using /dev/urandom for generating rndc.key"
+		/usr/sbin/rndc-confgen -a
+		chown root:named /etc/bind/rndc.key || die
+		chmod 0640 /etc/bind/rndc.key || die
+	fi
+
+	einfo
+	einfo "You can edit /etc/conf.d/named to customize named settings"
+	einfo
+	use mysql || use postgres || use ldap && {
+		elog "If your named depends on MySQL/PostgreSQL or LDAP,"
+		elog "uncomment the specified rc_named_* lines in your"
+		elog "/etc/conf.d/named config to ensure they'll start before bind"
+		einfo
+	}
+	einfo "If you'd like to run bind in a chroot AND this is a new"
+	einfo "install OR your bind doesn't already run in a chroot:"
+	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
+	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
+	einfo
+
+	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
+	if [[ -n ${CHROOT} ]]; then
+		elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		elog "To enable the old behaviour (without using mount) uncomment the"
+		elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		elog "If you decide to use the new/default method, ensure to make backup"
+		elog "first and merge your existing configs/zones to /etc/bind and"
+		elog "/var/bind because bind will now mount the needed directories into"
+		elog "the chroot dir."
+	fi
+}
+
+pkg_config() {
+	CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
+	CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
+	CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
+
+	if [[ -z "${CHROOT}" ]]; then
+		eerror "This config script is designed to automate setting up"
+		eerror "a chrooted bind/named. To do so, please first uncomment"
+		eerror "and set the CHROOT variable in '/etc/conf.d/named'."
+		die "Unset CHROOT"
+	fi
+	if [[ -d "${CHROOT}" ]]; then
+		ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		ewarn "To enable the old behaviour (without using mount) uncomment the"
+		ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		ewarn
+		ewarn "${CHROOT} already exists... some things might become overridden"
+		ewarn "press CTRL+C if you don't want to continue"
+		sleep 10
+	fi
+
+	echo; einfo "Setting up the chroot directory..."
+
+	mkdir -m 0750 -p ${CHROOT} || die
+	mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run} || die
+	mkdir -m 0750 -p ${CHROOT}/etc/bind || die
+	mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ || die
+
+	chown root:named \
+		${CHROOT} \
+		${CHROOT}/var/{bind,log/named} \
+		${CHROOT}/run/named/ \
+		${CHROOT}/etc/bind \
+		|| die
+
+	mknod ${CHROOT}/dev/null c 1 3 || die
+	chmod 0666 ${CHROOT}/dev/null || die
+
+	mknod ${CHROOT}/dev/zero c 1 5 || die
+	chmod 0666 ${CHROOT}/dev/zero || die
+
+	mknod ${CHROOT}/dev/urandom c 1 9 || die
+	chmod 0666 ${CHROOT}/dev/urandom || die
+
+	if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
+		cp -a /etc/bind ${CHROOT}/etc/ || die
+		cp -a /var/bind ${CHROOT}/var/ || die
+	fi
+
+	if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
+		if use geoip; then
+			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP || die
+		elif use geoip2; then
+			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP2 || die
+		fi
+	fi
+
+	elog "You may need to add the following line to your syslog-ng.conf:"
+	elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
+}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 799aa22301ee..d68cb786e614 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/tempestsdr/Manifest b/net-wireless/tempestsdr/Manifest
index efdf07d96492..1221630d0f4e 100644
--- a/net-wireless/tempestsdr/Manifest
+++ b/net-wireless/tempestsdr/Manifest
@@ -1,4 +1,4 @@
 DIST tempestsdr-0.0_p20200221.tar.gz 67322675 BLAKE2B 6ad4b5c4a32e70e7336d1bcac9f9c3e0dd1bdc0ca42e67bef20e9f31475e127f212d3558e20d275e18651cef018c134e233c5b8c0c9e85e558414e2c15993ac6 SHA512 2f29ad22d8ae2e71cdd359e066989928576a7e8c0ff344833445843df4cdb343ae1d6336810595fe720cb3d56867c8c17d8776dcb3bfda02eb53b85c9c930ef1
-EBUILD tempestsdr-0.0_p20200221.ebuild 1045 BLAKE2B b3c6df744d4c19395a06f54792cc18f8a5c4af02c84d979235447e7b5b7d69cca47d78be7b68517305ecf7bb5c95773ae5c13195c961d0e1c57b50adc2dde997 SHA512 a93aac6d1daa91254dfabb635896d6db73a6e662780fd0fff2952b669a1d3e860d611a4746c4eb847cb9e705bf5eefbff8c88d4acc39600748ed7ad602f7e410
-EBUILD tempestsdr-9999.ebuild 1045 BLAKE2B b3c6df744d4c19395a06f54792cc18f8a5c4af02c84d979235447e7b5b7d69cca47d78be7b68517305ecf7bb5c95773ae5c13195c961d0e1c57b50adc2dde997 SHA512 a93aac6d1daa91254dfabb635896d6db73a6e662780fd0fff2952b669a1d3e860d611a4746c4eb847cb9e705bf5eefbff8c88d4acc39600748ed7ad602f7e410
+EBUILD tempestsdr-0.0_p20200221-r1.ebuild 1064 BLAKE2B a52b152f6de8b6ed554fc0871ac74f492550619f9c7d99a1ce90c7628cb90b71c5da3aaf6f6cdf9ac708387f154ad2fea455b4344ba2efe92e41c41dcac3f0d7 SHA512 9dc5bb2557ef8ae1e41c556a238099d5bc1ce41e7099acb7d3d2914e4b4835a59c29d1c01e44bab6a1e7f93300a98c790181cfd7f0c2b9d0e33f14177a0b204b
+EBUILD tempestsdr-9999.ebuild 1064 BLAKE2B a52b152f6de8b6ed554fc0871ac74f492550619f9c7d99a1ce90c7628cb90b71c5da3aaf6f6cdf9ac708387f154ad2fea455b4344ba2efe92e41c41dcac3f0d7 SHA512 9dc5bb2557ef8ae1e41c556a238099d5bc1ce41e7099acb7d3d2914e4b4835a59c29d1c01e44bab6a1e7f93300a98c790181cfd7f0c2b9d0e33f14177a0b204b
 MISC metadata.xml 221 BLAKE2B 934906fa89eba872d36cbda450e77f91a1eb97deb78ffe527ef21e647d19dafe3593316ee447f092242495a4c05bb94e5bdab308013f57ac6e37047010066461 SHA512 ff4505c5e831d3a8e469b4bf56cce97765e107c6d6fdcb0832a6a31d5aae607feaa122a15f80e6bc9091bb023bda32497521874a69b978d0aa2c1f9059dbb07a
diff --git a/net-wireless/tempestsdr/tempestsdr-0.0_p20200221.ebuild b/net-wireless/tempestsdr/tempestsdr-0.0_p20200221-r1.ebuild
index 8a649e9a4665..1301229d0e69 100644
--- a/net-wireless/tempestsdr/tempestsdr-0.0_p20200221.ebuild
+++ b/net-wireless/tempestsdr/tempestsdr-0.0_p20200221-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit java-pkg-2
 
@@ -22,6 +22,7 @@ fi
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*
+		dev-libs/boost:=
 		net-wireless/airspy
 		net-wireless/uhd:=
 		net-wireless/rtl-sdr
diff --git a/net-wireless/tempestsdr/tempestsdr-9999.ebuild b/net-wireless/tempestsdr/tempestsdr-9999.ebuild
index 8a649e9a4665..1301229d0e69 100644
--- a/net-wireless/tempestsdr/tempestsdr-9999.ebuild
+++ b/net-wireless/tempestsdr/tempestsdr-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit java-pkg-2
 
@@ -22,6 +22,7 @@ fi
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*
+		dev-libs/boost:=
 		net-wireless/airspy
 		net-wireless/uhd:=
 		net-wireless/rtl-sdr
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 954ae80c1980..6fadeaa29dac 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 4f935c8e10da..286d22c609ff 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3937,14 +3937,12 @@ media-fonts/fonts-meta:ms - Install (free) fonts for the "ms" preset
 media-fonts/ibm-plex:otf - Install OTF fonts
 media-fonts/ibm-plex:ttf - Install TTF fonts
 media-fonts/intlfonts:bdf - Install BDF fonts in addition to PCF
-media-fonts/intlfonts:non-free - Install non-free Tibetan fonts
 media-fonts/liberation-fonts:fontforge - Use media-gfx/fontforge to build fonts from source
 media-fonts/montecarlo:bdf - Install BDF fonts in addition to PCF
 media-fonts/mplus-outline-fonts:ipafont - Generates new fonts merged with media-fonts/ja-ipafonts
 media-fonts/noto:extra - Install full upstream font set
 media-fonts/noto-emoji:buildfont - Build Noto Emoji font with supplied images.
 media-fonts/sil-charis:compact - Use more compactly spaced font
-media-fonts/sil-gentium:compact - Also install more compact version of the font.
 media-fonts/terminus-font:a-like-o - Changes view of letter 'a' - a looks like o (see homepage)
 media-fonts/terminus-font:center-tilde - Place the '~' character vertically centered on the line instead of to the top.
 media-fonts/terminus-font:distinct-l - ll2 variant with more distinctive l (lowercase L)
@@ -8826,7 +8824,6 @@ x11-apps/igt-gpu-tools:runner - Build the test runner
 x11-apps/igt-gpu-tools:tests - Build and install tests
 x11-apps/igt-gpu-tools:valgrind - Support valgrind annotations
 x11-apps/igt-gpu-tools:xv - Enable intel-gpu-overlay xv backend
-x11-apps/mesa-progs:egl - Build EGL utilities
 x11-apps/mesa-progs:gles2 - Build OpenGL ES 2 utilities
 x11-apps/xdpyinfo:dmx - Builds support for Distributed Multiheaded X x11-base/xorg-server
 x11-apps/xinit:twm - Control dependencies on legacy apps (xterm, twm, ...). Safe to disable if you use a modern desktop environment.
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index f07b0ce33329..56e375cb3ff8 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index bfc2184a9732..d8073cac1180 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -15,4 +15,5 @@ EBUILD hdf5-1.12.1.ebuild 3144 BLAKE2B 2bd023c0ade920fc795f4434260318095a34b200d
 EBUILD hdf5-1.12.2-r1.ebuild 3389 BLAKE2B 536c7a51533849c8b19f2a086b35352a9a845d89417ba10464ef53b0ee444fcab2fec0e369d5bdf9a1aa4746c0f004726200db1b60b67b3876eb425504d6d173 SHA512 1ccc6ce4ca8712bdd39d79e5acd82886a592d0578f14162ed374675e9bfcd2e8fe838354acea030298b340c9fac22f250913e205a9e943a4919237c0603766cc
 EBUILD hdf5-1.12.2-r2.ebuild 3456 BLAKE2B d59c684d4494e7f7f484dc87297ef1465998a8f9d75c2cf268e1d689353fd5e092c27dd0a61907ffe11cb35c424e2f9e972a7e3770f0938808bd704cdeca7961 SHA512 4e0b609458298ab12214aa68bb298063d35f64c12c4eff0cc656546b930dce5cc5891e9cdd6d030f7d616aa4ca13386dbbb020970cbea6d939bbe2356fb310ed
 EBUILD hdf5-1.12.2-r4.ebuild 3209 BLAKE2B eb7b30bee62cbad778b07f089026395d70046e3845b636bdb526e0960e4ae3789f2e5d1c9eac6fc213b755809c42946cf332446582d032d04900cfd80b57b06a SHA512 e6c2c24f9558c381b8ae5da8f0967635c64b02ad5f8288d5a08841c7637f8de7b72229f89d8be2cff5cd0c8c4482b404db3a7d41aeeaa927157c257f91fb62a3
+EBUILD hdf5-1.12.2-r5.ebuild 3289 BLAKE2B 9b8751188360a65c3175e3b902b8b34a650a4460e2b698cd56d9ab507a4e67d53ab46aecdb795adf0b24c8d02280d798ad807ceeef9e4fb743666466a85a96e9 SHA512 b3338097229fd8a788d50afb7e87002b5cbcd4fbc05b66addd0ebf7d8840f727c4dd2fd051b6ab6a2d27c2e87fadda0a8fd1fe15c21ce7d4ab997198bc1d68d4
 MISC metadata.xml 985 BLAKE2B 989b487ac17b7cfc1920144207dbe101cb46d059e2f219d3da15094a7cd2da9979d0d11ef177f2c5542f010aefb4c1be10768d5c98a3e0b6235a4228b452f283 SHA512 e95daa26ad42f923ab113db8e62d2a37e4d8296e1cdc8e856a2f4ab5ffbcd0797c7be7365d3f3d55ab1e6cb45f17e6264bcf0df8d2ae013e972e28f679dfce61
diff --git a/sci-libs/hdf5/hdf5-1.12.2-r5.ebuild b/sci-libs/hdf5/hdf5-1.12.2-r5.ebuild
new file mode 100644
index 000000000000..9e9c9c1af629
--- /dev/null
+++ b/sci-libs/hdf5/hdf5-1.12.2-r5.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_NEEDED=fortran
+
+# We've reverted *back* to autotools from CMake because of
+# https://github.com/HDFGroup/hdf5/issues/1814.
+inherit autotools fortran-2 flag-o-matic toolchain-funcs prefix
+
+MY_P=${PN}-${PV/_p/-patch}
+MAJOR_P=${PN}-$(ver_cut 1-2)
+
+DESCRIPTION="General purpose library and file format for storing scientific data"
+HOMEPAGE="https://www.hdfgroup.org/HDF5/"
+SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="NCSA-HDF"
+SLOT="0/${PV%%_p*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cxx debug examples fortran +hl mpi szip threads unsupported zlib"
+REQUIRED_USE="
+	!unsupported? (
+		cxx? ( !mpi ) mpi? ( !cxx )
+		threads? ( !cxx !mpi !fortran !hl )
+	)
+"
+
+RDEPEND="
+	mpi? ( virtual/mpi[romio] )
+	szip? ( virtual/szip )
+	zlib? ( sys-libs/zlib:0= )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.9-static_libgfortran.patch
+	"${FILESDIR}"/${PN}-1.12.2-no-messing-ldpath.patch
+	"${FILESDIR}"/${PN}-1.12.2-no-strip-symbols.patch
+)
+
+pkg_setup() {
+	# Workaround for bug 285148
+	tc-export CXX CC AR
+
+	use fortran && fortran-2_pkg_setup
+
+	if use mpi; then
+		if has_version 'sci-libs/hdf5[-mpi]'; then
+			ewarn "Installing hdf5 with mpi enabled with a previous hdf5 with mpi disabled may fail."
+			ewarn "Try to uninstall the current hdf5 prior to enabling mpi support."
+		fi
+
+		export CC=mpicc
+		use fortran && export FC=mpif90
+	elif has_version 'sci-libs/hdf5[mpi]'; then
+		ewarn "Installing hdf5 with mpi disabled while having hdf5 installed with mpi enabled may fail."
+		ewarn "Try to uninstall the current hdf5 prior to disabling mpi support."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Respect Gentoo examples directory
+	sed \
+		-e "s:hdf5_examples:doc/${PF}/examples:g" \
+		-i $(find . -name Makefile.am) $(find . -name "run*.sh.in") || die
+	sed \
+		-e '/docdir/d' \
+		-i config/commence.am || die
+
+	if ! use examples; then
+		# bug #409091
+		sed -e '/^install:/ s/install-examples//' \
+			-i Makefile.am || die
+	fi
+
+	# Enable shared libs by default for h5cc config utility
+	sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" bin/h5cc.in || die
+	hprefixify m4/libtool.m4
+
+	eautoreconf
+}
+
+src_configure() {
+	# bug #686620
+	use sparc && tc-is-gcc && append-flags -fno-tree-ccp
+
+	econf \
+		--disable-static \
+		--enable-deprecated-symbols \
+		--enable-build-mode=$(usex debug debug production) \
+		--with-default-plugindir="${EPREFIX}/usr/$(get_libdir)/${PN}/plugin" \
+		$(use_enable cxx) \
+		$(use_enable debug codestack) \
+		$(use_enable fortran) \
+		$(use_enable hl) \
+		$(use_enable mpi parallel) \
+		$(use_enable threads threadsafe) \
+		$(use_enable unsupported) \
+		$(use_with szip szlib) \
+		$(use_with threads pthread) \
+		$(use_with zlib)
+}
+
+src_install() {
+	emake DESTDIR="${D}" EPREFIX="${EPREFIX}" install
+
+	# No static archives
+	find "${ED}" -name '*.la' -delete || die
+
+	# Remove "perf" executable due to file collisions with dev-util/perf.
+	# Previously with the CMake build system we only installed h5perf, so
+	# let's simply remove the file for now.
+	use mpi && { rm "${ED}"/usr/bin/perf || die "rm failed" ; }
+}
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index 56b688c50522..be75187b299c 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-bradking/Manifest b/sec-keys/openpgp-keys-bradking/Manifest
index 3a6bbf593925..14aa5d27e5dd 100644
--- a/sec-keys/openpgp-keys-bradking/Manifest
+++ b/sec-keys/openpgp-keys-bradking/Manifest
@@ -1,3 +1,5 @@
 DIST openpgp-keys-bradking-20220407-2D2CEF1034921684.asc 42061 BLAKE2B 657ae2501acaf0e6db039a32417291dcf9f7d0003f63bf4d2eee0a7777d6379c45c8c3b78e4c7f5af14607a01e4862442d3fe4124c59355f7247434142e42a2b SHA512 39882aebd86d2bc006e25929957c6932578764baea10ca4eefaa5aa81c9b326172ac81db17d992103ebd8b8bd0755d3e35b3b8e595ad669e05b87dfaf593ab19
+DIST openpgp-keys-bradking-20220818-2D2CEF1034921684.asc 44364 BLAKE2B 57a1568cc6a219ad1f84fcde53154f81d3c86b07ac3297754163ec87bff2114a6c71dc3a9771815b1c0856e2514f41126a4615437ff81ecddca2b26426ae1c53 SHA512 496728a608ce1f6b2b2f255ee87e59990ca2c1f8e3fb502ab7a34fe1bad7224dfb7bc0de78c2bb14385a34cbd09c0c2f1ed214ab9441c3254bb76efab8f8f0d1
 EBUILD openpgp-keys-bradking-20220407.ebuild 689 BLAKE2B 1169bd6a9b8bae4ef97fc522b9af4b46224371f2027e0649ccf9bdae2e320ee516db8b62f7676cdc88ebe3d06543b5d8aca0d8f6848713e2ca089fbfaa2245de SHA512 89971471a7948a681922189c62f8d81f1b486caa31d6452783499bf10ab31ad51c25a635efe05fe660b73b3d58493dc7f17752555de6777104fbbb8af5c37510
+EBUILD openpgp-keys-bradking-20220818.ebuild 689 BLAKE2B 1169bd6a9b8bae4ef97fc522b9af4b46224371f2027e0649ccf9bdae2e320ee516db8b62f7676cdc88ebe3d06543b5d8aca0d8f6848713e2ca089fbfaa2245de SHA512 89971471a7948a681922189c62f8d81f1b486caa31d6452783499bf10ab31ad51c25a635efe05fe660b73b3d58493dc7f17752555de6777104fbbb8af5c37510
 MISC metadata.xml 392 BLAKE2B d059f46c7b3b46ebd8596df82a5d2479a33d74b4f6eaff330e6f48640ac2b098dd67b55dd3b2cc44e241207a86fc210e1e2e41f702249dbdbd05b741d54eaee6 SHA512 db79e839a12b52055865e523317faa09c8dcc86ec6887c8f9c8c226ab8cbda42feea96b0cdfe67311facad099f2deb983c7ed9e536634efb808cf20b7a5e7179
diff --git a/sec-keys/openpgp-keys-bradking/openpgp-keys-bradking-20220818.ebuild b/sec-keys/openpgp-keys-bradking/openpgp-keys-bradking-20220818.ebuild
new file mode 100644
index 000000000000..bd4b15526f30
--- /dev/null
+++ b/sec-keys/openpgp-keys-bradking/openpgp-keys-bradking-20220818.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="OpenPGP keys used by Brad King"
+HOMEPAGE="https://cmake.org/download/"
+# Mirrored from https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xcba23971357c2e6590d9efd3ec8fef3a7bfb4eda
+SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-2D2CEF1034921684.asc"
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - bradking.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 43c3d41db73a..738e78554b98 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index f2aad50526a3..278cc0334a76 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -6,10 +6,14 @@ DIST genpatches-5.15-63.base.tar.xz 2523256 BLAKE2B 99979433623fad89d9a237f80f12
 DIST genpatches-5.15-63.extras.tar.xz 3932 BLAKE2B 372a8997239e0c1cb97db2fe02e5c3e2f8f26c29705f8210d1eb30168fa0a77209491111b64e399d4846b185ddd2141171cb13e5da5ae85e620e382262256a6c SHA512 461eb99b6e124a648bdaacb015c7b413e102cb28768bb149a154d1c4fc570ae241a73c5bc64024b385ac8eac831a6bf65e79bd93f168fb93f94b0fae133080f7
 DIST genpatches-5.15-64.base.tar.xz 2531728 BLAKE2B 9e4501d9a9e423b50d1cea9265dceef035879be1f16b9745aa7bbac8370f7f79c4e6c36fc2f3971a7d766a00fe6bab585148433601ca0ed30b40ca4a9a870406 SHA512 70d7c3f805b0ce6a9cd8034f0fcf22db203621c7464c7eb158a0d7a01dfeafe313934119a639305d02da25afc1852aa29d16d9d0de3d0101bc3bc4a0af18e8e8
 DIST genpatches-5.15-64.extras.tar.xz 3932 BLAKE2B 3d6407f9f8da0b68072b93f74e33255c8c33523f7101a2fb9ca5ec4156f6f8cedb558a6cecca2c46ca8775869a06805ab21962f2fd7d1e974ed1813f3c0fc59f SHA512 6dc7dee3aae37c5504857188fd6957ef85765ecaa5bc17f70e172af66e3ba9d005f27aabbe9171b848f17c9bff5acedb42f01389ae1b6866dca44a1b6611d4e0
+DIST genpatches-5.15-65.base.tar.xz 2795292 BLAKE2B 75100ab05b0b1a8fcd2df2176f6e8b28758cc518919de20f6be4f764a6351b589242a61d7229c05f1e1228338a74c16cc3c8523a0cc7cf991d9d03f6fcf543a7 SHA512 e87e718e39ecac03229d607cf7c869819af06445f86d63a3b5e478b2968d6e9811ceed189f146bf4b99d8fb21b3d9100e3a09a03bf270b521afc227f45792617
+DIST genpatches-5.15-65.extras.tar.xz 3932 BLAKE2B 5e530c404d10e8ce0a228377a18ad473b2bf17e68b4214d7de676ea872fbce439ef08e610dbe7a33ace4721dcb5b1bec1b0672e19bafe00d7b9a1812934f51b8 SHA512 0df7125b6bbe48790a2f9c3cda7f273dede01c2ff532fd494014435040f58839f07ec0f9c0ba9d4f21738fc969cc8e59c3d1cdc23238db6f2d5d1373bdb6cdda
 DIST genpatches-5.18-20.base.tar.xz 776528 BLAKE2B 3d7a0cf2c6f9a5d28049c42b6e2ffccbb707232aef139c9b9aae33c37d6cef22b45261094ac5c3e23019123709c642c69d3f181683d790305f97d72d93a48177 SHA512 db5a44c919f29f0c37cd21384a5ffa6b528575f5b5dbf71800d3a6277f793ad4ee6a6d04a35c3ef5f90906133a91f4a0e23ae43e86f678a25b23bb1c77761c22
 DIST genpatches-5.18-20.extras.tar.xz 3924 BLAKE2B ddea420397d5b64ac5e964db6b2d863cca0a4fd46a3969af7f24b7803b0f07278b54363c1b43fbc4f305ac4b44e5880d5af0bb10cd2a0a08bc0e4fbd51c9e35e SHA512 51203e404cc8084974725f78dd521f5d7864f40380bc1f45596b8754a57f30535e32c3984c01a4d12b38b6118eb1448126f96042d8a2b5007167428e09761726
 DIST genpatches-5.18-21.base.tar.xz 786248 BLAKE2B 60d007f0ad81b8c8af63789f98613850edc92836672a743bf543c2e7078b666a41f4f277d5b9f001a018811733f266d87651198e3c087c00f8bc8239b2b89236 SHA512 0018fdc5805dff2f92b0f3c2e78e0a30359eb5a02b8b24cc4ced7c42d90e6fa904e8b43982ffdf9bc5c55b9faed1c003bfd6510f3f9c8042180884aa3a87ba2b
 DIST genpatches-5.18-21.extras.tar.xz 3924 BLAKE2B 582b7320bf607d925d9b2e88094032b161cc08df1d5118777454f4f6b966812b333235f2bcf016957d7bcecde6d77b4dc7b76047b8374e34b9262e2aad5e4708 SHA512 26aed20e6cc179d10bb017b1707d5bf5d76a92aadd9ab73acc655352dea8c6fd03cc4848da953800077bf43d1d5e1dddeff01ba486d5c2f6524707a236a956b9
+DIST genpatches-5.18-22.base.tar.xz 1204144 BLAKE2B ba4067fe632a1d27f3ac63c5bccbd7bd8d96e43436d67bae0162ef1a7b32a05a8b8ee301cdaf00765450a4c83939c11bdee27ebbd31267896bb30f5ee7d0e794 SHA512 83ba19dcbc7e1308039c4352527cdcf21caac9fa0c0e90206ef855d46e4f5d828e8f9a9e7c36a3a043f0789493d6e8df739ce97a225dad00a46e1c94c570dcc4
+DIST genpatches-5.18-22.extras.tar.xz 3924 BLAKE2B 757c3a9db4b9f293a2ba903354e4ff2e922f256107a5b050fc4fdf9a0d04c5597761aa4c8c2e015da0d16af2b577521d17f437d3dd796cd0d2ccc74386141e20 SHA512 526a738627ff17c811250aa18b3e10243c0dd492822db60516bf3ce0430bc276a881548f9c6e424398ebb1da3f44270e092692332322ffa9c04457801439e774
 DIST genpatches-5.4-208.base.tar.xz 4869104 BLAKE2B 3e9038248ddcfd22d67248e65199cca89bd2b8b3aa99aafcee63e5c294dc360c01d7d7eda809e1c18b06a9356363c575339197b2425bcafa8676cad68c17f90e SHA512 880fd09492e5cb0fa8a94e2df5fdf912be59210f1f142a456e3f80c31142e92bee3161bd77038b606616442cf3396b3961a24422de3056f72b4556d06262d3a5
 DIST genpatches-5.4-208.extras.tar.xz 1812 BLAKE2B 3e5b8cae462a748eb36af66c4ebc393fc09882a1fa23cce6f82a078ea5598c23c2ecbe7029d6e2060735fe342b3a7bb5c235dcf16081bba0f05a6b88501af991 SHA512 b550dce1b6d090959eaacd523ee1be258fbf9db84309054c3cce9beb0bae710ff2e1c23f480310072fb08f7456bdf825b3ba76d57e999fc1597368df93e65677
 DIST genpatches-5.4-214.base.tar.xz 4943544 BLAKE2B 5b7d27e1b520cdaff98dc9fe6ddfe102a9c09fb8a5fd36a57d5f36ebbd7639ce1a59dbeb55e71ede1129a3890318b740b24bc654716f81840d6d2e6d8a95de20 SHA512 6494bb7d1b9ef0e46fa31a164b3c807338463dcd4d8108e5a0c5d944196f1b3e1df51192f733861514a302af3eefee530b1e173dec9b6ddd3bb0120e47714fbf
@@ -32,6 +36,10 @@ DIST gentoo-kernel-5.15.60-1.amd64.xpak 70797308 BLAKE2B f1b03cdb40fad00add7e464
 DIST gentoo-kernel-5.15.60-1.arm64.xpak 64204876 BLAKE2B c52b3857eaaec74d72798a975597e5eeabf85a87c5712ddab18437219970f4d5f69e2b2418f0cd725fb714e7b54c165e4a6e3a04fe22f590ef1e29b770d3f3a7 SHA512 98bbf7e5092afe5f4163488abfeab6804ffd89538e03bb62f26bb3d83c7ed843dc2068fd8e9535bc1418b6f412cfa2727b9218110e968b278fb4fbe4e018252b
 DIST gentoo-kernel-5.15.60-1.ppc64le.xpak 58046287 BLAKE2B d559a1301f5fbfd181555577aa8920fe9b0f7b0dcf951772ce1f86e578a5c0807d4b6209c47517fd8594594831c0ab48ae72909d4f7505db4a61b51c5dd0a615 SHA512 b6eabf9bb15678afc165e9ffc74c96b5e16a9cfdeabf62eb3e868c49f7c7eec3d44e889be0223c0bab57853978e0146ca7c52c53fd01236e755bd46c42e8f456
 DIST gentoo-kernel-5.15.60-1.x86.xpak 60117817 BLAKE2B f74cd729b8d1378c6c7d431054632400089e1e86ff67d1f3080dcd509069e63fe3e6b0d60d49729774336a128e78a92972cdb4defa50f3a7101f0770d772689f SHA512 b052e220de708d7822a06015ee4f0d5582fdd87f889a21468d555a8fe900ba4b940fc8513bcc6265b336fe93b8f9f54031ceb02a49e42301510879170dc0f5ff
+DIST gentoo-kernel-5.15.61-1.amd64.xpak 70781040 BLAKE2B 79e44041b813c5d2948a047a2a26a9c017eeae0b4b30e23f3a8e0bb300f2a0867b11c9d9fa58aa8bae7fb265f279fdf366fe3ae9d0640d1c06da84ee016c8772 SHA512 ebef22e230363fdb7efe4ffd1a85d690120858f7bdb8900d969feab9478acd8ab5837b62c32b084cfebc59a7be0ebe5f3a749c47cd8d904e8345832de247c16b
+DIST gentoo-kernel-5.15.61-1.arm64.xpak 64236098 BLAKE2B 25e8c8f506f3024799696d5ae8b6f3d97e0ada5f65b2f244d3a922d7348a528e3dc5b0eab4ba3cbe31c3582cff53744c4d8b9fac23d54d8a1d309cca26d3dffe SHA512 6dea290820795046efbfaba31aab34cc377a471324a367f815e964807a6f7706e087eaafecdbb7640580c113a2b3fd949c90a79a832569e137d9a079ce17bd92
+DIST gentoo-kernel-5.15.61-1.ppc64le.xpak 58209981 BLAKE2B 2bda57f94365e8cc3a9bbd203b08fbecdbf161470929e861597818f2b6da043a35aee74ce000a736feb14cd948d00a43ae95d1558cdd31bc4781d737be4319c5 SHA512 78ea818b3e8e1a1307e6b647f8aed280fdcff993198f18f1ab840d1b32b40f20dd5bd23ad16a61e2dc12aef6a0d7c34e7b52a6b0b6fc3928ec8fdfe615e0b117
+DIST gentoo-kernel-5.15.61-1.x86.xpak 60124404 BLAKE2B 2c14ee86470f98aac1d4d8bbedf875b4ad055b2bf29ef5107fbe478a7e2d942e012e95d6fcf32b5682d408a3fa97e6a90871f2f097c0c76fc075ed2ebe8d243c SHA512 618a30251a4c5ddd5429348c12e30509e7c63f1b16427b834d3d05659d9154e96d5d7f3a587a201e80b91e4a8e3266bb144edb3bf68602cfa4b3828a7d9456a3
 DIST gentoo-kernel-5.18.16-1.amd64.xpak 72884888 BLAKE2B 1af89a98a01ac244b4b49f669f739a5040d35e1357c41e6477159a7bb538b8b4ed844a28d512bf1513e2234c20cad663555ef028b2d5378b364eca95d3cbbc47 SHA512 b654a185147259c5100a1ea162c9f945190e472014edeae6704ece63e9486b95c9dfa31e955f9576611d461095f2e309b58c1abc9ecb0dafa5bc1fe92ea0654f
 DIST gentoo-kernel-5.18.16-1.arm64.xpak 65231934 BLAKE2B 0ca27c34a9dcde9ec1bec606ba86489f780e31e3b4357135d10292db04028cd346246d71e10a7c09103bad99a4fa7a2a19610e94890af06baf617ff52bc973b3 SHA512 c75d1c72db2f74d52ced1c46caa12cf25c81834aeed42a038dc049a54aa4f9e45ca51a419f55e021a065159f81c3e8303d5e03967dbed7de2102bd7ca68b3d2e
 DIST gentoo-kernel-5.18.16-1.ppc64le.xpak 59491902 BLAKE2B 805bcb11a93fcdd8fa7e264025c662f46e555aa640838c25578084a3995dbfab2292e7056d5c52352a0060a8114a3d4ae8068f6f3896b46e61c563a6080053fd SHA512 83b37cb57fea22468398a40a04d222dfa2f784e2819bc5e4850d7223b78a72ce41cc2ff6f66f6e7d2fd495c1e7555a287bc143417d28271de0904f50cc22901f
@@ -40,6 +48,10 @@ DIST gentoo-kernel-5.18.17-1.amd64.xpak 72811508 BLAKE2B e4ba9c9f723cce9d1659a47
 DIST gentoo-kernel-5.18.17-1.arm64.xpak 65244760 BLAKE2B b080ce68f4da9bda3aa439185c027183952c34c1814d19da7c51c5074abb8ab5b6b17382750b7dee1e4c7710a0c2f95eaca9c9363ba334d37db07622fb47d0be SHA512 14b0c35ef8d3f70c1d2d4b1dc1b126feb7e9ec1c46c214906f672d4548ac39d29bef05fda9732af50a9e099904a45aed59bd4bc7adbbb2f3f7142d6fa7a83122
 DIST gentoo-kernel-5.18.17-1.ppc64le.xpak 59474452 BLAKE2B c9a877cf9be0a5843a8083c323ea3a24fd1c99272316f64487b317a9d18075365fb7e0d65b8ab283ddb08d26af7812b9e1ea355f9716e597660d273123561707 SHA512 ae4117e9d76a85a5befe2178104c3cf913615b9a3537dc4c952603b5f5dcac9f03bcb7d2f7be67b9436e9611cd5df6eb8739096d091f40540c9a2c3c24058a3c
 DIST gentoo-kernel-5.18.17-1.x86.xpak 61829723 BLAKE2B 12f41413dd83e28e93c6e6d0bca80a65399803fa24ccd3beb2937f337fffe9d293c233c753c305cce57942779b10081610e9448efcb77eda75b3bc42bf2e9610 SHA512 ecfce7fd1ba4b64fb87be1a84d610627e2347b795dd301f713f34cabddd3de875beff9c8d37f1610bd774bca70603975fe7a020970cecefa98f0066c8037978b
+DIST gentoo-kernel-5.18.18-1.amd64.xpak 72827701 BLAKE2B a9ae7e1aceea06b422a9fe1a4465c79a4a0ce247a50fd6f411f08d7eadf1c00279bdf85988321e8fc076300f5c55eb102c78eeb5f21655b873ebaca2c75e322a SHA512 ca15a4e0cbbf246fff7ef89bd425cb52b9f25834584e255b9c3f0dde5b1a6ae405e60ba0497e2b990355665a8c37984865a52d40ce841f74f7951977e9e2e573
+DIST gentoo-kernel-5.18.18-1.arm64.xpak 65266650 BLAKE2B de5a490f917a8179021d0c2ed0ca69ae563f39e38f363ab501bd85db1a1cfb4a5edc311f782310c9ba3bdcce6886fed45c2771f1c7e48e44a1c3a94d3e70145a SHA512 a2163de72d85abbaa2756cf8ac0e1dbb1f8a700716570bb2bd42d5dd297f475520bd834b2f7f87ae13aff55b5731c90dea7c742c1d4ff6f72535786817daa63c
+DIST gentoo-kernel-5.18.18-1.ppc64le.xpak 59452234 BLAKE2B 25acccd37b8402c124ab0308d7f841b54ddcd6fdf460081525c6c28db3afc136187053a15eb4464f62dcac8b56c901884ebab40838bc47c325aeb0db27740c2c SHA512 4f58411a2947a91f81e909664e0c6086529efefae77ee0c10fa5136165ac37b9a37ffdfba084d09c5e5ee40c6909148e08e34c18b607737c988df83870b6f146
+DIST gentoo-kernel-5.18.18-1.x86.xpak 62756128 BLAKE2B 18776e78eb93f144135f3e3cc846f7870bbad736bc28390bfa6f6646deac32eb05c8c957476e53643ec72f502f7c213c35db8d1044fbdb225bc3ef665105174b SHA512 19e481a00e66fecb518e3a095e8f8fbf9967a7a0d3406a1f1afb2ccc09300f1da113024e62cea0ace8699d0eacf8dc4a86cf9338e7f9de752c6ed468dd1ec730
 DIST gentoo-kernel-5.4.203-1.amd64.xpak 61567440 BLAKE2B 7cb004bf0d90e517a1636e984afb21be3408da74afcd4ccd886007dea5a221b33bde828ee8dad4e8fcf120d737be2d7ff4a0780f36643300209e69f996921112 SHA512 a79fbd6ce459265e4eda827063aee6557208c73094bf937959eb265d100a0533083e35276d6df77a8b8a7a05161b292232ac42b18b8a903232f2eb065192d0c9
 DIST gentoo-kernel-5.4.203-1.arm64.xpak 57698276 BLAKE2B 2bc0a4eba7ef829a4e705706b7ce33496b8a36d33f0808bc315df45b9d7a00e6aabda71274956b484d394f3431bb22be118c9b37711bd5cc74d6d1d6dfa0027b SHA512 d4849d69a3a6134d260945721b164d74604a4b2e590d1545f7444fa9cfac4f7d8419b8d77dd586c87a52ef4bad3620810993a7161083370e2438b9723f249d37
 DIST gentoo-kernel-5.4.203-1.ppc64le.xpak 55132763 BLAKE2B bfba496c86aeb1c0e0826e8222e60fa96a0c57b0b66af485c619eea277ed64fe590ffe0c7932da36de2c2f180772ec6dd5d1925bbdca3d52ec2c9e0ed0808113 SHA512 e598776a8d6cf90d6a92f12af3899a28eca53fe037906c0de5e57f5b8a128fdde98d9453b06e0796d4c4b8d27b5b211db1aa777a0f1636b4cfe73e26be96d9fc
@@ -60,8 +72,10 @@ EBUILD gentoo-kernel-bin-5.10.135.ebuild 3175 BLAKE2B 00db42c3c9ad24c64d887e8e2f
 EBUILD gentoo-kernel-bin-5.10.136.ebuild 3181 BLAKE2B df517998c1165deede98f869bfd2851a1b797a6a5f8b70cb3c02401f703c77abfd379ed0f3f846ddec463eb0ca3bb21186b44cb9b722720b8f6c463bb0df0626 SHA512 7eba790dea41d43118ff3991b8fa2e65cc3f4c2b7075df992a1cfbcf312ba5cbdbc1fffd631851ca3698bbba565a211026c8c28e87e0fc5191f60e55fdc8ffc0
 EBUILD gentoo-kernel-bin-5.15.59.ebuild 3175 BLAKE2B 123d18c5ecc2a7f61fc523212e65288686e70f8b90f0f4a82e4293ee4125c1558e6eb2706740e8761203215871dd4974ad8122f42c851faf657792d0f77a77ef SHA512 956abe2b5146b901039e677523c787ae86824a973f78900c32f2956805c6f8d62bde05f6ddd1a77c1ec7c5c512d945267fc2123de4763489d6cf6bad60f38da2
 EBUILD gentoo-kernel-bin-5.15.60.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
+EBUILD gentoo-kernel-bin-5.15.61.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
 EBUILD gentoo-kernel-bin-5.18.16.ebuild 3167 BLAKE2B 51f48f8c0da28e2063601a0acefaf96d1b6910ac56a80cfd585f2930112c52945e17287a1025f282a35918d24f58caef907a336f532f24962367355a9c3d92bb SHA512 d114a4460c7ada94b8b06ca44b8ba09077170a13165f089bf3a55c04b83f7911d7047c593cdfd18292e91b29bfdf4fa09d534cd1364c8fd1274e77e11f551ff6
 EBUILD gentoo-kernel-bin-5.18.17.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
+EBUILD gentoo-kernel-bin-5.18.18.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
 EBUILD gentoo-kernel-bin-5.4.203.ebuild 3177 BLAKE2B b9df1ff36a996b688640bca679f8342d7cfd016e9305d8b967f5b5895b417ad0aff4e5b07023bef65c3aa7c2f895d3a21c019ddcb48a0dea5844bf16a35a9602 SHA512 46ec6d4b5f3b818ae84d60e7dc1a8abd69f5221d609c5d176a8160cd1bfbcbaf41da3b374369747c98143d5db532bb8e4969d84fa3164d7a2b1e9819b8131ddd
 EBUILD gentoo-kernel-bin-5.4.209.ebuild 3176 BLAKE2B 21e6678df90fc9bf8026a0f26c88f313a2a40222c125c63fd5bd42709eeb8527be5c4c5a465f53fbdc93403860127e68627ee17f5c7f4e0d05d90902cbd6d1f8 SHA512 2fe40540923f9ae7f888e7a593c570bb972fdc85a800dfdd102284babb0b3f9458969a92a8e2a7aa349bdcc3633dcd3fe4d286ec24c220ec376e0346501fdb6d
 EBUILD gentoo-kernel-bin-5.4.210.ebuild 3181 BLAKE2B 852c1e5dced74978b88730b17ec3a1bf8461ef9ab922b07b1b2e40dd1aa6cb32b9452e0fd96e63369bec9e235c3a99a7d0f2215e0e3ac331aaa161232cbd613b SHA512 e0b994133da4ad035094bde587951a4a41f161fe067b58076a759fba38fdd724ad127e25a912260b26db9fbf2bec3cef5488d87735400fae46d89cc68650a867
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.61.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.61.ebuild
new file mode 100644
index 000000000000..0787e9b25ee5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.61.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.ppc64le.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	# ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
+	ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.18.18.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.18.18.ebuild
new file mode 100644
index 000000000000..0787e9b25ee5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.18.18.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.ppc64le.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	# ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
+	ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 1c9a26bec3ea..563a56f0d9cf 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -6,10 +6,14 @@ DIST genpatches-5.15-63.base.tar.xz 2523256 BLAKE2B 99979433623fad89d9a237f80f12
 DIST genpatches-5.15-63.extras.tar.xz 3932 BLAKE2B 372a8997239e0c1cb97db2fe02e5c3e2f8f26c29705f8210d1eb30168fa0a77209491111b64e399d4846b185ddd2141171cb13e5da5ae85e620e382262256a6c SHA512 461eb99b6e124a648bdaacb015c7b413e102cb28768bb149a154d1c4fc570ae241a73c5bc64024b385ac8eac831a6bf65e79bd93f168fb93f94b0fae133080f7
 DIST genpatches-5.15-64.base.tar.xz 2531728 BLAKE2B 9e4501d9a9e423b50d1cea9265dceef035879be1f16b9745aa7bbac8370f7f79c4e6c36fc2f3971a7d766a00fe6bab585148433601ca0ed30b40ca4a9a870406 SHA512 70d7c3f805b0ce6a9cd8034f0fcf22db203621c7464c7eb158a0d7a01dfeafe313934119a639305d02da25afc1852aa29d16d9d0de3d0101bc3bc4a0af18e8e8
 DIST genpatches-5.15-64.extras.tar.xz 3932 BLAKE2B 3d6407f9f8da0b68072b93f74e33255c8c33523f7101a2fb9ca5ec4156f6f8cedb558a6cecca2c46ca8775869a06805ab21962f2fd7d1e974ed1813f3c0fc59f SHA512 6dc7dee3aae37c5504857188fd6957ef85765ecaa5bc17f70e172af66e3ba9d005f27aabbe9171b848f17c9bff5acedb42f01389ae1b6866dca44a1b6611d4e0
+DIST genpatches-5.15-65.base.tar.xz 2795292 BLAKE2B 75100ab05b0b1a8fcd2df2176f6e8b28758cc518919de20f6be4f764a6351b589242a61d7229c05f1e1228338a74c16cc3c8523a0cc7cf991d9d03f6fcf543a7 SHA512 e87e718e39ecac03229d607cf7c869819af06445f86d63a3b5e478b2968d6e9811ceed189f146bf4b99d8fb21b3d9100e3a09a03bf270b521afc227f45792617
+DIST genpatches-5.15-65.extras.tar.xz 3932 BLAKE2B 5e530c404d10e8ce0a228377a18ad473b2bf17e68b4214d7de676ea872fbce439ef08e610dbe7a33ace4721dcb5b1bec1b0672e19bafe00d7b9a1812934f51b8 SHA512 0df7125b6bbe48790a2f9c3cda7f273dede01c2ff532fd494014435040f58839f07ec0f9c0ba9d4f21738fc969cc8e59c3d1cdc23238db6f2d5d1373bdb6cdda
 DIST genpatches-5.18-20.base.tar.xz 776528 BLAKE2B 3d7a0cf2c6f9a5d28049c42b6e2ffccbb707232aef139c9b9aae33c37d6cef22b45261094ac5c3e23019123709c642c69d3f181683d790305f97d72d93a48177 SHA512 db5a44c919f29f0c37cd21384a5ffa6b528575f5b5dbf71800d3a6277f793ad4ee6a6d04a35c3ef5f90906133a91f4a0e23ae43e86f678a25b23bb1c77761c22
 DIST genpatches-5.18-20.extras.tar.xz 3924 BLAKE2B ddea420397d5b64ac5e964db6b2d863cca0a4fd46a3969af7f24b7803b0f07278b54363c1b43fbc4f305ac4b44e5880d5af0bb10cd2a0a08bc0e4fbd51c9e35e SHA512 51203e404cc8084974725f78dd521f5d7864f40380bc1f45596b8754a57f30535e32c3984c01a4d12b38b6118eb1448126f96042d8a2b5007167428e09761726
 DIST genpatches-5.18-21.base.tar.xz 786248 BLAKE2B 60d007f0ad81b8c8af63789f98613850edc92836672a743bf543c2e7078b666a41f4f277d5b9f001a018811733f266d87651198e3c087c00f8bc8239b2b89236 SHA512 0018fdc5805dff2f92b0f3c2e78e0a30359eb5a02b8b24cc4ced7c42d90e6fa904e8b43982ffdf9bc5c55b9faed1c003bfd6510f3f9c8042180884aa3a87ba2b
 DIST genpatches-5.18-21.extras.tar.xz 3924 BLAKE2B 582b7320bf607d925d9b2e88094032b161cc08df1d5118777454f4f6b966812b333235f2bcf016957d7bcecde6d77b4dc7b76047b8374e34b9262e2aad5e4708 SHA512 26aed20e6cc179d10bb017b1707d5bf5d76a92aadd9ab73acc655352dea8c6fd03cc4848da953800077bf43d1d5e1dddeff01ba486d5c2f6524707a236a956b9
+DIST genpatches-5.18-22.base.tar.xz 1204144 BLAKE2B ba4067fe632a1d27f3ac63c5bccbd7bd8d96e43436d67bae0162ef1a7b32a05a8b8ee301cdaf00765450a4c83939c11bdee27ebbd31267896bb30f5ee7d0e794 SHA512 83ba19dcbc7e1308039c4352527cdcf21caac9fa0c0e90206ef855d46e4f5d828e8f9a9e7c36a3a043f0789493d6e8df739ce97a225dad00a46e1c94c570dcc4
+DIST genpatches-5.18-22.extras.tar.xz 3924 BLAKE2B 757c3a9db4b9f293a2ba903354e4ff2e922f256107a5b050fc4fdf9a0d04c5597761aa4c8c2e015da0d16af2b577521d17f437d3dd796cd0d2ccc74386141e20 SHA512 526a738627ff17c811250aa18b3e10243c0dd492822db60516bf3ce0430bc276a881548f9c6e424398ebb1da3f44270e092692332322ffa9c04457801439e774
 DIST genpatches-5.4-208.base.tar.xz 4869104 BLAKE2B 3e9038248ddcfd22d67248e65199cca89bd2b8b3aa99aafcee63e5c294dc360c01d7d7eda809e1c18b06a9356363c575339197b2425bcafa8676cad68c17f90e SHA512 880fd09492e5cb0fa8a94e2df5fdf912be59210f1f142a456e3f80c31142e92bee3161bd77038b606616442cf3396b3961a24422de3056f72b4556d06262d3a5
 DIST genpatches-5.4-208.extras.tar.xz 1812 BLAKE2B 3e5b8cae462a748eb36af66c4ebc393fc09882a1fa23cce6f82a078ea5598c23c2ecbe7029d6e2060735fe342b3a7bb5c235dcf16081bba0f05a6b88501af991 SHA512 b550dce1b6d090959eaacd523ee1be258fbf9db84309054c3cce9beb0bae710ff2e1c23f480310072fb08f7456bdf825b3ba76d57e999fc1597368df93e65677
 DIST genpatches-5.4-214.base.tar.xz 4943544 BLAKE2B 5b7d27e1b520cdaff98dc9fe6ddfe102a9c09fb8a5fd36a57d5f36ebbd7639ce1a59dbeb55e71ede1129a3890318b740b24bc654716f81840d6d2e6d8a95de20 SHA512 6494bb7d1b9ef0e46fa31a164b3c807338463dcd4d8108e5a0c5d944196f1b3e1df51192f733861514a302af3eefee530b1e173dec9b6ddd3bb0120e47714fbf
@@ -20,18 +24,22 @@ DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 44dd51ec45ebc71bffcd6d85a2fefba
 DIST gentoo-kernel-config-g2.tar.gz 4359 BLAKE2B 965392fb5b3c1290c596d3e8593cfcf54e76cedd47de335c1b9658c1b35649af18a94639bf3df84507c797e6d7ea074f7f2a2579d2d01073478b30a4f167b2aa SHA512 d1bdef2e817799fcebbcdae1f3b1666f8ca70b0d5adca74014dd665f6b02c81b839220d8fe3794ea1202e1f2589d281344699864207c98b95d23a1d1f03bd42d
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
 DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 94e59440681535e38137b71814e1ae53f57a347f62cf31e0c1c8571ae43d9ae9be9957743c8cbc9ec74850c964eaabefe6799a28bc311ea7b99ee31391b47fb1 SHA512 fb77d3b73a215f97d70cd6d8c96ed20e497786b99ed7d7a7f2ed60cc1251289c1a4c7e058c41b5efac62e4a9b4b3d917dbdb11585955bba2b6584981430f4ddb
+DIST kernel-aarch64-fedora.config.5.18.18-gentoo 242571 BLAKE2B fdc6876156c2a280d94551e64ba9427f634573390717558326d7afca34b8f5dc331929aa1cd4097d66b3ea916d3dd6c91977b70bbdb259ae4b95139f38f2334e SHA512 33b4ce891feea2dbb76c42a8ec24fcb7082e453e87ec7eafb56763f4778af6e460a9a9e92b18dabcd284741cd0856ffbf8069417a130190a0443e054ab83c76c
 DIST kernel-aarch64-fedora.config.5.18.9-gentoo 242551 BLAKE2B 6ee62379bf28cc3d77eedeceb8437762e43cde6953828c23554f98b3de3236a808317a268d0885ba92720c59d25f3a1d8cdfda63bc51717f53574d3e7be988c2 SHA512 8aecbf9c1dc43e0c848890ebe38748fb6ccbc61000d5a22a36067d3f7baa9e52faf159c9a071c84195a624303eed6fac468eaeaf633ac25d33290277aaee36e3
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
 DIST kernel-i686-fedora.config.5.15.19 222233 BLAKE2B 9e0f4dd37058f59610e46a87d3165039e76299d3c186fbfc3312101bac1b8b198de404075f5bbc6f5e2ba04cfd45f9d02bdf94b01c3ed11b9275f37f11ee7617 SHA512 49ffc39de86763e707a5c0c07c1367d34e9249615f29fdf97904d7b61a375a86fc4ba37a2f02b5f61e4c76ad65d9ba12716d2523af6faa003f6336d7ae61a953
+DIST kernel-i686-fedora.config.5.18.18-gentoo 221018 BLAKE2B d317cd62903839c19bc8a601c67016b9663ecba640df353a6d161175de84b7154da7cc316c06c7a2765543989933066a26c3b257a1db30a1d726d5a57959bf2b SHA512 4cdfb0a0c9d6c8152f2c7f5aae3aa31bdbcabeaa8d3400d96407fa462ad8d922908520f804cb6db434012a1048e4bfdfe9ea6aa70bf1e456f6137b1a7a99726f
 DIST kernel-i686-fedora.config.5.18.9-gentoo 220827 BLAKE2B f73a4fb7d46e9275b5a0ab119aa8915cb7897a5652664efbd71596b5b3be6ee4cf9f9c7907ef3fe45ab2a2868512fad7b4b11213534d6260815ca4eca7593ae0 SHA512 afce5864ea980c1a7b53c187b483c6fa8eb88d11af9114d71b6177b4347d534d7f9dd68240c0cbb729e0da3cc01a5783b6e150d94708f1aabaa6c9956bacf06e
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9 SHA512 3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
 DIST kernel-ppc64le-fedora.config.5.15.19 213339 BLAKE2B db6bbc9f402b8b48a2441e39d1a78dc112656ae842bc5594065cfd2ec3f6d462e4bde200e8736a70192af35fb3a5d1fc42683783a5b7620881f3a95bb0bc5f4d SHA512 b43439c24be8fa8bdd17d4c0beece799544ae45b2c289f0202fa5eb7a52dce0165a0cbc924b0decf877582af9688efd675cbfbd2313ff85fcc2c8563bba4b1ad
+DIST kernel-ppc64le-fedora.config.5.18.18-gentoo 211967 BLAKE2B cc39a3fa68e738242f9e49f9d9e5d66cb983a3b8ed9d5575b3b3602c169b41f1c0048bcd02a4e052441bc94ee1679b3e68e0623426dd8de61253fb114b359405 SHA512 ddb1418c1d8d4978aaa29464bbd8925bee847b037b7c96b27ef9c4c70eefd0678800580dcb6db2c64263304541c7ab896b23be9d97f0ff56dcde18d5366d7923
 DIST kernel-ppc64le-fedora.config.5.18.9-gentoo 211942 BLAKE2B f92e988198b08bd7a30976d92ba152ac2986324c223202dc73bb733c903015095498b529cb5dd3b3d86d678c7ca0adba7f4807e9046b8c8215b2e1ebd06e53d5 SHA512 4f1d85a3f858a6e240e0bc34b37a77f78cf128b19de78404de9f0463d0d3fa6e87b84e5710b7ce501b92e162d798b372fb6843e83b3821a77a73ead2385e9014
 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c SHA512 b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
 DIST kernel-x86_64-fedora.config.5.15.19 223286 BLAKE2B 239995703c01dcb6d179133dd115bc0a57872c07d7a08afaf4d92cf6d78f0c17b19487b5b399ac7fdde5d460fa7931628147817a569fef2c3a62951c96054bdf SHA512 9bee4aff7e5ef4ada57bee7496aaf47b8fdd5c936c4c9b580660d130db0678eaecdebdbcab0dfcaf5c17a71f6419069840db10f5886806b6fc810f8a3619554f
+DIST kernel-x86_64-fedora.config.5.18.18-gentoo 221988 BLAKE2B 05e85bc4b71b4a904ad248f1c779c666e765d67729e48c590d36247fd62d5a2bf0245731e015eedca809db76d21af41ea409f8566b985892be1681d87738a62e SHA512 8c769c76359a25db5030f6309ec911afc0e50b3a0f8d6886d45993f5dbe3738b262f6ca4275d3bae9ae26d279b94911234d5f6edf4065c9446344e84b17a35a7
 DIST kernel-x86_64-fedora.config.5.18.9-gentoo 221797 BLAKE2B 1873ffeab78c7e9a8186d255dac5b7dc5fcdadfa97d6a265aaac1583006adc1c0a150eff6892f1a82e622f77122051d0eca5e2cc0d9b95f8d0e36212d6c47ed3 SHA512 7c2325a12de85bc1aa300b5f3846711a20d43817a60a68e7cae84ac6505b3deb158c9dd0871d86e148f46435f36549231566abe276ffc2ee8bb9dd2ac5c40960
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
@@ -42,8 +50,10 @@ EBUILD gentoo-kernel-5.10.135.ebuild 3596 BLAKE2B 82ed2819c4a7fa9ec1359008005fe9
 EBUILD gentoo-kernel-5.10.136.ebuild 3602 BLAKE2B 352e6cbc7b4c3dd628368308fcd01ecf133d36603a284f0c20d8e65da3e87ef29a7097a5f03c62b8d3aa6db1b5725a079b491abae7d8e0847695ec0dd0218776 SHA512 b5f058e544388a1c99337cd517479ec508f580ac5f107d8a6c39f5e3ee2c19d6953896c7fd654bf7a726a1ac974e8eb7872e4c4a1cf884277a5818cc438647c5
 EBUILD gentoo-kernel-5.15.59.ebuild 3593 BLAKE2B 0854919a718f192cc5422a4dd2d551fbb39c6ccd2b9bad56c86896c85ebded885639f80327c8f1806b5750112293848652f664acc7b0984457a378d6b4d2e0b3 SHA512 17878f909948b0de1255cecbcdbb04fd5223a212c2a6cc441e60f09bc28effda02183e2b7a8a9d597fe1bb5ad419cfe5acfc66d97503ec09f48b3eddac97d899
 EBUILD gentoo-kernel-5.15.60.ebuild 3599 BLAKE2B 402de31263f3c4d3ec38d2d5712e5839862840a318182603cd2ce05090b162a4a581deae6ff3416ec62ac6980fe5454e79ac55672db81653052336ada9461cfa SHA512 209ce3b8b6cbff81dc66e3211811599efd954be45ca4a85bcbf311d23a5a55d86bbc6144a7dc1509a9201f5744c3b15583eeef41641b7318e240545778897a51
+EBUILD gentoo-kernel-5.15.61.ebuild 3599 BLAKE2B 402de31263f3c4d3ec38d2d5712e5839862840a318182603cd2ce05090b162a4a581deae6ff3416ec62ac6980fe5454e79ac55672db81653052336ada9461cfa SHA512 209ce3b8b6cbff81dc66e3211811599efd954be45ca4a85bcbf311d23a5a55d86bbc6144a7dc1509a9201f5744c3b15583eeef41641b7318e240545778897a51
 EBUILD gentoo-kernel-5.18.16.ebuild 3857 BLAKE2B 92dd8fcfc85ea17399bbc5e9a15783647711d5e6ab1132100790236c6c7115377a58427cafdc404a4a03ba79189b2c9689acc7200294373976088d5d1c667c86 SHA512 ccb5878cc0881e9c3cc557c603e28633a18d7e6ecc277c68d9e94b6c1ce9f36d3e6509e45d8f3db166cf191811c4c2c542c3fab872c08a56ba24c97530604d51
 EBUILD gentoo-kernel-5.18.17.ebuild 3859 BLAKE2B 9e5e82039fff42abed2d5849ef461aae1c0fc815b5ec91582cc297f0a2dc9835da410a040e1c4df527b752d2959d7d92e0a4dba7395e034362a4759fb22af83d SHA512 dc4464dc9fe79a13e5b31d0e8d2dc07a214b6dbeab870c49d5dba27ed8d57a4b7bddbfae7ce7f28eebeed569041cfd10f1a3f9687542b1621f9ab3e5ed355ab8
+EBUILD gentoo-kernel-5.18.18.ebuild 3860 BLAKE2B 67bed8a6744d5d27fced8ddd6caf3a2fb228e9c420b190083baead2a93d02af94e4ff189c2ee244df67e80abaf237c5356d5eb1e4043bfbcf7e70e1c39fd1b13 SHA512 a0343436352e8fa8d732a892805c66dce50f065a98fa902e87108602ca10757c08cdb397a7f8c68da9241bf78fba10374e584d967507bfb2d6ad4a35576d75eb
 EBUILD gentoo-kernel-5.4.203.ebuild 2799 BLAKE2B 207cd00b51009fec32423c53d9c669b1b33ecdbf344ee4f963899370322bb5ecd24e8c12ee82913fa1d0459bcfa0efc85ef219a455ee0930c06e88b9d444c4a0 SHA512 e087902f31cabcedf79fbb741f323857f9627e5060441caf0700325a6d1f1a279611bef5e5fef75db8ff418ec33c3a5a2487b1f4c6eeea5d5edf4ae47f949c38
 EBUILD gentoo-kernel-5.4.209.ebuild 2798 BLAKE2B b1d47c52d5496b250f304d7efd8958685026bfa82ccd1e11209d536fc7f35c93a447cb0c168b74da195b4241a10934748323f4f6a323aac620782ad6b81eaba2 SHA512 ad7c624b9bd1b8d7751934ae531e02909a85a9e4641b5e79004a29c18e7d453282682f403a939af3fc85a529601a7255d9db70e098a527eb3f93f4bba047063b
 EBUILD gentoo-kernel-5.4.210.ebuild 2803 BLAKE2B a56ad91f6edabf8645ec65291587ec72114eea6a5ee23b0f068d49aa16ad5d79faa46bba5447fb3a351826c7bb576233d7a1beece9843256ab789ef6afb696a8 SHA512 6f1a85386010497e19047e42eaa8caab33dc40089926732d5d01c826bcf91555fdb01414aaa505a1d33ca5228d903ee32c412c5b93a494815f744d68846c9ab9
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.61.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.61.ebuild
new file mode 100644
index 000000000000..64c99e19532c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.61.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.18.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.18.ebuild
new file mode 100644
index 000000000000..fe9fbe9a2de6
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.18.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=5.18.18-gentoo
+GENTOO_CONFIG_VER=g2
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		riscv)
+			return
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 7aa2351610a1..8c803a6734b3 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -1,18 +1,22 @@
 DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588 SHA512 3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
 DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 94e59440681535e38137b71814e1ae53f57a347f62cf31e0c1c8571ae43d9ae9be9957743c8cbc9ec74850c964eaabefe6799a28bc311ea7b99ee31391b47fb1 SHA512 fb77d3b73a215f97d70cd6d8c96ed20e497786b99ed7d7a7f2ed60cc1251289c1a4c7e058c41b5efac62e4a9b4b3d917dbdb11585955bba2b6584981430f4ddb
+DIST kernel-aarch64-fedora.config.5.18.18-gentoo 242571 BLAKE2B fdc6876156c2a280d94551e64ba9427f634573390717558326d7afca34b8f5dc331929aa1cd4097d66b3ea916d3dd6c91977b70bbdb259ae4b95139f38f2334e SHA512 33b4ce891feea2dbb76c42a8ec24fcb7082e453e87ec7eafb56763f4778af6e460a9a9e92b18dabcd284741cd0856ffbf8069417a130190a0443e054ab83c76c
 DIST kernel-aarch64-fedora.config.5.18.9-gentoo 242551 BLAKE2B 6ee62379bf28cc3d77eedeceb8437762e43cde6953828c23554f98b3de3236a808317a268d0885ba92720c59d25f3a1d8cdfda63bc51717f53574d3e7be988c2 SHA512 8aecbf9c1dc43e0c848890ebe38748fb6ccbc61000d5a22a36067d3f7baa9e52faf159c9a071c84195a624303eed6fac468eaeaf633ac25d33290277aaee36e3
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
 DIST kernel-i686-fedora.config.5.15.19 222233 BLAKE2B 9e0f4dd37058f59610e46a87d3165039e76299d3c186fbfc3312101bac1b8b198de404075f5bbc6f5e2ba04cfd45f9d02bdf94b01c3ed11b9275f37f11ee7617 SHA512 49ffc39de86763e707a5c0c07c1367d34e9249615f29fdf97904d7b61a375a86fc4ba37a2f02b5f61e4c76ad65d9ba12716d2523af6faa003f6336d7ae61a953
+DIST kernel-i686-fedora.config.5.18.18-gentoo 221018 BLAKE2B d317cd62903839c19bc8a601c67016b9663ecba640df353a6d161175de84b7154da7cc316c06c7a2765543989933066a26c3b257a1db30a1d726d5a57959bf2b SHA512 4cdfb0a0c9d6c8152f2c7f5aae3aa31bdbcabeaa8d3400d96407fa462ad8d922908520f804cb6db434012a1048e4bfdfe9ea6aa70bf1e456f6137b1a7a99726f
 DIST kernel-i686-fedora.config.5.18.9-gentoo 220827 BLAKE2B f73a4fb7d46e9275b5a0ab119aa8915cb7897a5652664efbd71596b5b3be6ee4cf9f9c7907ef3fe45ab2a2868512fad7b4b11213534d6260815ca4eca7593ae0 SHA512 afce5864ea980c1a7b53c187b483c6fa8eb88d11af9114d71b6177b4347d534d7f9dd68240c0cbb729e0da3cc01a5783b6e150d94708f1aabaa6c9956bacf06e
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9 SHA512 3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
 DIST kernel-ppc64le-fedora.config.5.15.19 213339 BLAKE2B db6bbc9f402b8b48a2441e39d1a78dc112656ae842bc5594065cfd2ec3f6d462e4bde200e8736a70192af35fb3a5d1fc42683783a5b7620881f3a95bb0bc5f4d SHA512 b43439c24be8fa8bdd17d4c0beece799544ae45b2c289f0202fa5eb7a52dce0165a0cbc924b0decf877582af9688efd675cbfbd2313ff85fcc2c8563bba4b1ad
+DIST kernel-ppc64le-fedora.config.5.18.18-gentoo 211967 BLAKE2B cc39a3fa68e738242f9e49f9d9e5d66cb983a3b8ed9d5575b3b3602c169b41f1c0048bcd02a4e052441bc94ee1679b3e68e0623426dd8de61253fb114b359405 SHA512 ddb1418c1d8d4978aaa29464bbd8925bee847b037b7c96b27ef9c4c70eefd0678800580dcb6db2c64263304541c7ab896b23be9d97f0ff56dcde18d5366d7923
 DIST kernel-ppc64le-fedora.config.5.18.9-gentoo 211942 BLAKE2B f92e988198b08bd7a30976d92ba152ac2986324c223202dc73bb733c903015095498b529cb5dd3b3d86d678c7ca0adba7f4807e9046b8c8215b2e1ebd06e53d5 SHA512 4f1d85a3f858a6e240e0bc34b37a77f78cf128b19de78404de9f0463d0d3fa6e87b84e5710b7ce501b92e162d798b372fb6843e83b3821a77a73ead2385e9014
 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c SHA512 b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
 DIST kernel-x86_64-fedora.config.5.15.19 223286 BLAKE2B 239995703c01dcb6d179133dd115bc0a57872c07d7a08afaf4d92cf6d78f0c17b19487b5b399ac7fdde5d460fa7931628147817a569fef2c3a62951c96054bdf SHA512 9bee4aff7e5ef4ada57bee7496aaf47b8fdd5c936c4c9b580660d130db0678eaecdebdbcab0dfcaf5c17a71f6419069840db10f5886806b6fc810f8a3619554f
+DIST kernel-x86_64-fedora.config.5.18.18-gentoo 221988 BLAKE2B 05e85bc4b71b4a904ad248f1c779c666e765d67729e48c590d36247fd62d5a2bf0245731e015eedca809db76d21af41ea409f8566b985892be1681d87738a62e SHA512 8c769c76359a25db5030f6309ec911afc0e50b3a0f8d6886d45993f5dbe3738b262f6ca4275d3bae9ae26d279b94911234d5f6edf4065c9446344e84b17a35a7
 DIST kernel-x86_64-fedora.config.5.18.9-gentoo 221797 BLAKE2B 1873ffeab78c7e9a8186d255dac5b7dc5fcdadfa97d6a265aaac1583006adc1c0a150eff6892f1a82e622f77122051d0eca5e2cc0d9b95f8d0e36212d6c47ed3 SHA512 7c2325a12de85bc1aa300b5f3846711a20d43817a60a68e7cae84ac6505b3deb158c9dd0871d86e148f46435f36549231566abe276ffc2ee8bb9dd2ac5c40960
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.135.tar.sign 993 BLAKE2B a544cdf24ef0f1dc5ddc5622d8f00dc3af0fc38604d955c7a8b54e0c1fa7f7d60197551710cc2ab0bad69fc06d2077e5b1b796259fe29665d558b5fe656beff1 SHA512 ef565e3ae98acf58fa871e701b8a4ad2a3fd1f5aae109685cf1bd5cf0d2fca3f8361ca5d0d14613311a1bfc5069013249ece0f6eec4b88b2c4157caeca0686d6
@@ -23,10 +27,14 @@ DIST linux-5.15.59.tar.sign 991 BLAKE2B 80fe92152ba1ec23c4cd3b1c3edf6ca8b4c381dc
 DIST linux-5.15.59.tar.xz 126404076 BLAKE2B c601b25663f73438daa40f1a72039a4ca6a027cd356a9cca3f00341a8aab0845893d4ac848a43a34758c0959e38b11ac8857777531cf1472b18f3373ba6c426b SHA512 1dd5badf83bdde38dd43fe1f678b883200b6b4b52547281ebd0780ea1cc628138e5798e21a2eb4bd2fb71755808017fdff5c85259e2c3211da79fcc8fb87361c
 DIST linux-5.15.60.tar.sign 991 BLAKE2B 9260f307fcc8726b5ccdf174ceb956ca37f0c835cd77ea8cdc001f927e376885adc1a7dc979034f4972715d3ddb700bcfec053dcbe436314dd274a076ee236ea SHA512 992aa8c6efcb4406ae508661497645f8a128b5b672960e2d39c2341510e812dd7768f79578b3f99d02ee550781bf2775936cf957f0235727956a282af89ede1c
 DIST linux-5.15.60.tar.xz 126417608 BLAKE2B 9c6dd581012cc21c26d2cf204eb92a2c28d9598bb8da1b884b6f78101b3b590c55f1b14d31aaf6b24e3b74aab3c2d00d632cc805d09ffb03de40ca89507a2c98 SHA512 b9d08ddd749c990a5e5413b5fe99f594b5b4b0a637ef3f622bd32d52d49126c0772fb7efecdfa998b2cbcf0de03f83bd76634db1f1d99f04098e252183b21b98
+DIST linux-5.15.61.tar.sign 991 BLAKE2B 2b55c19796e82179efb226224861cae71de77343ce59ef85d2f699ae74b7c0f65a0b9a0e4aea8ba1e05c265b1b1c9188e50edb8fe641be4a3983959ecf017aa1 SHA512 52ada5d9972f41ed01fc98e0b2f865083a2bfef38a697ebacfafc8e30abb1d763fb34b998761e786aab217266d3855687bb5c2cb6bf92e1df99ee3352896b003
+DIST linux-5.15.61.tar.xz 126415308 BLAKE2B 5af05f98a2f563dc87fa4c41072da9405a0a7f0183a6b1f239e9dbf597f146d63223287e5cf0635e4a9f9fb027ffa06400217f9387686a1356675921b34520da SHA512 d2af99cab1b4fbc4ec43460662ec85a7a6f43cd20b8945de8168c5fcb1499afddf6468bdb5ccf89b2e487088d3b129650b77eae484718d2914698a82fc40135a
 DIST linux-5.18.16.tar.sign 991 BLAKE2B 5309ae0d80fbec35f4fcdfb82e3f1fd99c96ad53b82efe4ef95f0f7ee5f04be1e97f69bfe664080ff92fe21b327dc72e723515c0fe43fa52f6a43d1894454a34 SHA512 01edeffc25b4221907f0b57aca694361ff5cf5fd6235750422b23d95241b2a1b2cd3ba0fa4b8a895e1996df49d577654a16cb302c798e8c7365ec536088f6660
 DIST linux-5.18.16.tar.xz 129844784 BLAKE2B 60e9cc780af70242eaf3b41374acd8c11bb388a9aa17341aa98674e31a72cbd1c6ecf80158476fd762ed8955c6ded9a3ce8cd782ce0c956ddc3031c7487da686 SHA512 cc6813dc2c2bf8125159368e7b0b2812be220fd23cea98ec12ca727f3e032d313c80fc103abc55aa879c70105629dc54f14eed8e6fdfe00b9246bb850f86f5bf
 DIST linux-5.18.17.tar.sign 991 BLAKE2B ec46e8df0d2b2fa10b13a54284f46e058d2bb395599ebcaf5b5071b7ad61ec81673a73da4a5c09bd6603802d53f49b087e843f8b07b3b3529eaf12d3538e8c13 SHA512 053365b23cc7468b96b89ce56a788f6b67257727f35ff851a2a2006b9ff5b606c4d8c007553e0b62bec5989ba67667a3d47a169f4db9ee18cb35b2e5d860b582
 DIST linux-5.18.17.tar.xz 129891768 BLAKE2B 30af8d2fdc12378a8b4323757a2abee009a548c0b0019d14e38882e768d8f885b710a6f3e3e4eb8da746ce29a94d2f5707ce796fbdecb148dcda0e403fce1192 SHA512 0910f673fd457fece8e19abae6d538c6546463a290faf92e3b51cdfc28d876aff908e0d85bba221eebd4e8de70717a78f7646b16e738d70453583a7f2db8873f
+DIST linux-5.18.18.tar.sign 991 BLAKE2B 57ce40770a11f3042213e17b86927a66696152d6162d037f2abaf0d2ec92da123d39a5279c66235547efcf87490e878e105646760e0fb8d3c4781bdbceaf5292 SHA512 454a5abd6b7386787889cd858cc49e2d305de0376e0253abe3a186c59ab10d7d55f593176fa505971d98307c030b5f49ff1a9bebeca81d5698774cdb4330d041
+DIST linux-5.18.18.tar.xz 129853768 BLAKE2B 071651dc6e319a2ba7af97be5656e1ffefb1b4203fc164c93dea29929568133bad37c09816210e3c411dacfda153d2fa48d04eac64f16029dac0b481e29d0aef SHA512 4c9d078e00c1463534eff6eed3501c7e11d983844d672b6ac6bdc355a46cad00be5ccd938832f9bd2414b3332984f3753f4cffe7ec4381be804bb593da78cf88
 DIST linux-5.4.203.tar.sign 991 BLAKE2B 4e13305b908e1e158c61ae0667186cfd42e7dac237624cc871f584efc68c53d5de3a90379e801f5e26655293c584ab84e16c5f87d503c1e5381b6b9e8634d8d4 SHA512 867b1ac576df3db177f8c684291aed7a2094405a8c9f18c49c2f5f1e4c68b6fe4dbd211d65cdeb07db3522a6f485c03ce4993c687c0d93d85dd8af31b60fdb4f
 DIST linux-5.4.203.tar.xz 112925472 BLAKE2B 90467bcc6ca564affaa57adb0b0e0f7358dfedcb5d53309b987b239acadf6f9b5c77c4f265c7d5f8e6a6a42e9e5ed5a16cc17baeae004e2b55470c9d786de6ae SHA512 a7c7373cf5abe9ee48920b3f314020c9c552a8cd4e2eff67a32ef2f8300a789e7a7e9b78fd1a57b8a017ccc37a2d970b4abde5a85a7bd01766fc89af64cdbb69
 DIST linux-5.4.209.tar.sign 991 BLAKE2B e750fa4ffd74c55e555201c23c961bb056171bd009131132868a1d0af0fe878bc798d805461162e40009014661ce91f9da2aee863286bd82b27b359c701e8beb SHA512 6647e67a9515f5ea7cff75fb6e451475ca8115223d73eadd6762fd1874f51834f63d3b03c24895db25da9b635abc583651962bafdec4ba0e2dcf22ccc9609bba
@@ -37,8 +45,10 @@ EBUILD vanilla-kernel-5.10.135.ebuild 3715 BLAKE2B b05c31b018dd64fe0b94d899bc7a5
 EBUILD vanilla-kernel-5.10.136.ebuild 3715 BLAKE2B b05c31b018dd64fe0b94d899bc7a51a847cfc314e028fac2e7707cb910f1e208e0ba042f995ea94878a3a646ab654d422546a8f89dc78faea3d2884aaa72fafc SHA512 1427316489e333f980b3b5ec2d3eb1ebffcd13ca569146b81516a175b0681e5c5459f5cc0cbef64967d2c20765b56d9ba9c0f02374e92de1708702221d64cdf6
 EBUILD vanilla-kernel-5.15.59.ebuild 3715 BLAKE2B 0a92ef1cc83f1609e463ffd70fb223598a4d086cc996be80068e7e6fad7c5ee7c39cb8a87138721439fe9362d9001bd1f7c2c758f8579adc1e113d85acecb226 SHA512 39761d5bae8f003718e5ae9ed1b8c89b879b7214f5782c0fe81a1238d12b6944a22e9aadcdc5f2896b51a56052209677d0071c2fcbcdd2f48706c9199eec1755
 EBUILD vanilla-kernel-5.15.60.ebuild 3715 BLAKE2B 0a92ef1cc83f1609e463ffd70fb223598a4d086cc996be80068e7e6fad7c5ee7c39cb8a87138721439fe9362d9001bd1f7c2c758f8579adc1e113d85acecb226 SHA512 39761d5bae8f003718e5ae9ed1b8c89b879b7214f5782c0fe81a1238d12b6944a22e9aadcdc5f2896b51a56052209677d0071c2fcbcdd2f48706c9199eec1755
+EBUILD vanilla-kernel-5.15.61.ebuild 3715 BLAKE2B 0a92ef1cc83f1609e463ffd70fb223598a4d086cc996be80068e7e6fad7c5ee7c39cb8a87138721439fe9362d9001bd1f7c2c758f8579adc1e113d85acecb226 SHA512 39761d5bae8f003718e5ae9ed1b8c89b879b7214f5782c0fe81a1238d12b6944a22e9aadcdc5f2896b51a56052209677d0071c2fcbcdd2f48706c9199eec1755
 EBUILD vanilla-kernel-5.18.16.ebuild 3834 BLAKE2B f30b546364123a5adbd88cedab76649064a66e2d3ad35d79254a9696d294fad52cbfc747ce27eec877c1c14ee2a731cd6094a7aed1c5f26d1fa2b0328dee137c SHA512 6cdeb0863fde0bdfe9380decb6fbb5a75e1c87c1cba4611835fa90315b4a8cae544ae9a479a5cd59a2ea0d920d732a240b7bfea0b3ac36dc704f90fce403a754
 EBUILD vanilla-kernel-5.18.17.ebuild 3834 BLAKE2B f30b546364123a5adbd88cedab76649064a66e2d3ad35d79254a9696d294fad52cbfc747ce27eec877c1c14ee2a731cd6094a7aed1c5f26d1fa2b0328dee137c SHA512 6cdeb0863fde0bdfe9380decb6fbb5a75e1c87c1cba4611835fa90315b4a8cae544ae9a479a5cd59a2ea0d920d732a240b7bfea0b3ac36dc704f90fce403a754
+EBUILD vanilla-kernel-5.18.18.ebuild 3835 BLAKE2B 2d09a09697d242c85d255fa6a048ee882f8154ca6baf059c5f72d0d6e2103f6c300e90d7bd21abf93f21749de5e74b154a90f0bc59c8a63200afc42e1610d032 SHA512 eeade8ba2b907c10ab917f5bfd1f13fcf841e5f55af7b8d7fbea67fa776b84a9b65c15fdee92fbaef518c4ade9450bbabc209671c61cbdea15c59f2975fc6419
 EBUILD vanilla-kernel-5.4.203.ebuild 3001 BLAKE2B 7b8bce74e27909fdb673ee7477f8f8b988646071f112b1efabe3bde378872b21fb55f4486ef5f595562025506f5094866218a8afbf8bb69061dd4a3c24ed50ef SHA512 513282b9578460f32122cf9835c6a032e1659b691bfc8c56edbf459de57befa801ea881a86f1fd9ecdf96b838371e5ad319c748e97ae04253eb8e47479d7e579
 EBUILD vanilla-kernel-5.4.209.ebuild 3001 BLAKE2B 7b8bce74e27909fdb673ee7477f8f8b988646071f112b1efabe3bde378872b21fb55f4486ef5f595562025506f5094866218a8afbf8bb69061dd4a3c24ed50ef SHA512 513282b9578460f32122cf9835c6a032e1659b691bfc8c56edbf459de57befa801ea881a86f1fd9ecdf96b838371e5ad319c748e97ae04253eb8e47479d7e579
 EBUILD vanilla-kernel-5.4.210.ebuild 3001 BLAKE2B 7b8bce74e27909fdb673ee7477f8f8b988646071f112b1efabe3bde378872b21fb55f4486ef5f595562025506f5094866218a8afbf8bb69061dd4a3c24ed50ef SHA512 513282b9578460f32122cf9835c6a032e1659b691bfc8c56edbf459de57befa801ea881a86f1fd9ecdf96b838371e5ad319c748e97ae04253eb8e47479d7e579
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.61.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.61.ebuild
new file mode 100644
index 000000000000..13b58c5c9839
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.61.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.18.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.18.ebuild
new file mode 100644
index 000000000000..f3b1baeee682
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.18.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=5.18.18-gentoo
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index d59597ea1082..730ebf91ec41 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/libunwind/Manifest b/sys-libs/libunwind/Manifest
index e08b37ac8822..ebfcb65367af 100644
--- a/sys-libs/libunwind/Manifest
+++ b/sys-libs/libunwind/Manifest
@@ -1,5 +1,5 @@
 DIST libunwind-1.6.2-docs.tar.xz 25372 BLAKE2B d16562b29c49070f0cd6ad9211c7c3283b527bd88677d9ce50b15f27254bac504ea79b807e01f4f2bdb05649ff8980f94346ef9737bf5b5bd7c313e547222f10 SHA512 71bcb781cc37ccbef7b349225b1b3b4cd6ba4ce5a48d8478cea17f8245614b672d8e14b5a088e2d998ea717670a371925d4fbe407dde636611f7c2f2901065d8
 DIST libunwind-1.6.2.tar.gz 901392 BLAKE2B 3d0313f7e92cbc3e1a84ad3831a5170f21cdf772f1697ca0a59dea63cdd47da382e9f1fd77325d9ff8bcd47559a425dc883a820c646c628cd00faed82cb0f83f SHA512 1d17dfb14f99a894a6cda256caf9ec481c14068aaf8f3a85fa3befa7c7cca7fca0f544a91a3a7c2f2fc55bab19b06a67ca79f55ac9081151d94478c7f611f8f7
-EBUILD libunwind-1.6.2-r1.ebuild 3678 BLAKE2B 03a9e1885931f49a702d561e5ff0ad58ab6acc5dba7bbf01560cddca2cd31cb499042eb36bdb6b3aa0ac88a21abff60b37c762976870a8dd3f806604cffcfedd SHA512 62f6689aa706eee6b6a7ff908bcbf54d0f56472d794b40a60534ca0681ea6495160d9b0e2a4990e837d04c107d9337e41238204d8c1f341eb22f879eebce067e
+EBUILD libunwind-1.6.2-r1.ebuild 3657 BLAKE2B 1b7811bfbed8875c9b16d07f68bc2cc192e8788ccfb815fcfaa4fe8e9b80884e285699290a232289fdfc3c6b2d50bfd2f9e70dca72e4fe370d71bacce72a6ae9 SHA512 549f83c89894505b8060cf2fd3b07324084f8bddb97da1a05418bc96359a55b22dc04bafe7c4fafd53870f76cd73f2f3b5c68821321815d9b5b1b37b74cbaae7
 EBUILD libunwind-1.6.2.ebuild 2680 BLAKE2B 686f5fa9f0362c6669e9195e84f5f35546da5a6d8f66bdf0e9b91a580e1e20b9da4025718ed2f960dff7cbd66d325cb5aec6868b1147bed013486d9ebf4d6b16 SHA512 c44f75111e3a5f97aa85e6124c007c6216445d9ee3cff8418153229a2d97b83b5d97895576993a9c91a457e67f47d74ea50ac755fbbd55f7492a1cbf690ac263
 MISC metadata.xml 574 BLAKE2B cf49536a68a838e39d6c67191eff496d8910f1d58cd7830546e519af38972db7cf7add177a6e5902202d2a66bc6b3dadcd261505b3bb61f285f0be10a0db42e7 SHA512 bf5fd787ae0b233c7fe5e8f4b987c472a03b93c07adebf35ce27c7b6759b9ac239296d5ede6725ac11f5030365199533389e51ced10dc6a20bb5aa74baf34ab0
diff --git a/sys-libs/libunwind/libunwind-1.6.2-r1.ebuild b/sys-libs/libunwind/libunwind-1.6.2-r1.ebuild
index 144c3e79cac5..007df2e2a734 100644
--- a/sys-libs/libunwind/libunwind-1.6.2-r1.ebuild
+++ b/sys-libs/libunwind/libunwind-1.6.2-r1.ebuild
@@ -6,7 +6,8 @@ EAPI=8
 # Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-libunwind-docs
 # Set to 1 if prebuilt, 0 if not
 # (the construct below is to allow overriding from env for script)
-LIBUNWIND_DOCS_PREBUILT=${LIBUNWIND_DOCS_PREBUILT:-1}
+: ${LIBUNWIND_DOCS_PREBUILT:=1}
+
 LIBUNWIND_DOCS_PREBUILT_DEV=sam
 LIBUNWIND_DOCS_VERSION=$(ver_cut 1-3)
 # Default to generating docs (inc. man pages) if no prebuilt; overridden later
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index e36de8423cc4..14357cdd2775 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index e8675f14398b..4565a36c6f7f 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -2,8 +2,10 @@ EBUILD dist-kernel-5.10.135.ebuild 399 BLAKE2B 69c219977a0039ac43c6d4915c2328768
 EBUILD dist-kernel-5.10.136.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
 EBUILD dist-kernel-5.15.59.ebuild 399 BLAKE2B 69c219977a0039ac43c6d4915c2328768340b1aed5cf30564cc284912cf114713e2065633f0abdf195c5384b26b791f124259189a2bd691abe82847437c02ae9 SHA512 aa0ef63357b18176f14bc297ad6099177c279ba4748115ae985ae2d4ce6270d00965d5297f77b703c71acc25b2595a77740b62b9f531aeddba4b36c704e6ed24
 EBUILD dist-kernel-5.15.60.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
+EBUILD dist-kernel-5.15.61.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
 EBUILD dist-kernel-5.18.16.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
 EBUILD dist-kernel-5.18.17.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
+EBUILD dist-kernel-5.18.18.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
 EBUILD dist-kernel-5.4.203.ebuild 388 BLAKE2B 2cdbd973ff8c248bfe49420683c3040deb65612b315e212e61657b071338e9e54b321a9167467da27a04f185d9e8c4f38142f5195a8a9d658c2a464f76c0ee49 SHA512 164347601db14a749e61850cc9407485f8581a05efca57df2d57561ba467184728373f7ef5cf5b956bc695274814a4880ab3556b6e71187ae0050cf6bd228a11
 EBUILD dist-kernel-5.4.209.ebuild 389 BLAKE2B 604dc6fe3dd3cdbe1ba18de2f1a97349340737564290594ed9c189017d69d3f1b83140a93ea72f6ee23e23b834fb234410354c9d70bddef54cc5a95e568e9119 SHA512 9db92cf2cddb0ed08e30a23eb9beb30b3cf17988c2882c6f9f1f15c08bae99274da7387cba94fa50b04a43a854e1fee1e701f44b8dbbb7584a0960536ee916c2
 EBUILD dist-kernel-5.4.210.ebuild 392 BLAKE2B 0a46c1101b608049d3edf3c20d36e290ca8592cc5255a06f23c32f2635ef78d68ecbc7f9c6d640b86fc5b338de2eff99791996c22494418f923b3e67eb924eb6 SHA512 54ca8c680a499e7331c1de1e49f0b9e0ac684027362af4c7c62acae82ce82d93e656e922ddc64dbe7b989524b87dcc3aa769bfd9dec587ed1565c14ba2151462
diff --git a/virtual/dist-kernel/dist-kernel-5.15.61.ebuild b/virtual/dist-kernel/dist-kernel-5.15.61.ebuild
new file mode 100644
index 000000000000..5594b4186dc8
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.15.61.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.18.18.ebuild b/virtual/dist-kernel/dist-kernel-5.18.18.ebuild
new file mode 100644
index 000000000000..c2caefd6cfca
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.18.18.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 4e44510a92bf..cdf47789c0d8 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest
index da6e77fd4864..b3f15bdc8494 100644
--- a/x11-apps/mesa-progs/Manifest
+++ b/x11-apps/mesa-progs/Manifest
@@ -1,9 +1,6 @@
 AUX 8.5.0-Disable-things-we-don-t-want.patch 5868 BLAKE2B ed8b2e78ce7e05076a74f7ec415afa315db6d6e197936f03a2cb2a322d9ea33e2cdbb15431cc67d26c40ae07045d941fcad357a61eee56e1c26b6b21d1ad0e59 SHA512 8546b12244339fecbf49ce6d1e32701eefaf915d482adecc58c1190cdcf9a918ea7a135988381173c4742bb3b1ba78fcb96285ce6056744f0ed0cb4395855945
 AUX 9999-Disable-things-we-don-t-want.patch 5920 BLAKE2B 91a2a1e986d351d1224c28cc03af4128cce698609a0544e28559539ffc166787010a18423ce47e8cf574ddbfedf755e833d32cbe1f76f7d72bac504882f079fc SHA512 1b7a0ed30b2deb472c47408cc51a5733404c655653dfd7e25c15fc17e0f4da04012506c4b1de3fead689fe7315ad202ed55fb5b4ec884a4d0946c5c895377564
-AUX mesa-progs-8.4.0-improve-printing.patch 11963 BLAKE2B ad2dd57bf0959da6253d0e5c19523e701d03b9d4465564ff3f7e1462e2f36db0ef6eca46ad847f8f92f44fb91c46e87425d430c47c13f7efc130540071fa3ac8 SHA512 31048947ba19b03277d5dabff8bf3209274e9c95da3b33d9e27c3c1cdf71c3027cc0591ee27bdc0e8dff506da2f0601911cdf5899594674d2dd178204db3085f
-DIST mesa-demos-8.4.0.tar.bz2 10073259 BLAKE2B d251e705c6e3d2fe959161d736401fd06ba267a9c389341098373670b6f44ca7cdb451d96e94e3b22f006b696a9b19e38096423f6438544539f46beda91c03f4 SHA512 b72d03cad36e0535ff18dcfb222ec4200064b9264f6da51a6e5f03b0dd912abe188bc1d600b6698de3ce6f63b28d2ce01565886ca8e7079edc4967fbf2fb0957
 DIST mesa-demos-8.5.0.tar.bz2 10367517 BLAKE2B 60e9edfcfe6d28f73964b81ae4e016fdbeb45d9d6d91de71bf736c86fa6181749f2e12729c8c716f6e6f5d4e39075de131877d1f09c3e511a4338b0f44ddb6a6 SHA512 df6a7f09638ca389d6e8bc569e599dcc59c9aa280bcfb95976d83e5cd3edfe74bb3a31f0953956dc16faa540ee5b09990e3377e1341d836fc527e50ace6e60b8
-EBUILD mesa-progs-8.4.0-r1.ebuild 1913 BLAKE2B 835635568c965741f3ad48e4921011ac4aabd0b5032a05ee7e53894942dccac78f9bdb5767b9ce09182b0f7819899f4163c55b6d91b1a69c15d2bdb700462584 SHA512 0bba7f77b310f3a0511acb711aeec47b69ffe29b35bc35e374dc918247820121ba17dd2bc3d7ede88cc2cb0c744a653284aa9e3d0a691157326a46b8ba051aa7
 EBUILD mesa-progs-8.5.0.ebuild 1804 BLAKE2B c453575100a78f7b5599698e6eb13b538314e189e892cfef3670e10b9aa6f7de83995046131e7002352176cf1c10b6a05ddd44d5df01d5dc29171ef78ca99d56 SHA512 f388241bbabd38ec926cfa71d12ba8c5d4e494ca3aa33c7f38786df59c8fd870be198096e7e619353ae1e979b379a8a784d84573e8432738172afa7a45df096a
 EBUILD mesa-progs-9999.ebuild 1802 BLAKE2B e000a568251ea02ac0abdbdc8102f05b7eee49633699c07dde71d6783d29b656fbda85b80aa60456692dbdb262a077636cc2d95ac80457c14f5ddb60844ed4b4 SHA512 4ce30ae2375e523dcf5ce89340bbd6ed7dd440d590ea8608b4bf5692e2108bda2afbe2730edffebe2a7c33c9befa995d53294ddbf1e5268fbc2a42b131f59a03
-MISC metadata.xml 476 BLAKE2B 2f40a2161f77a5ac55a486f6570c4fca5b85f6c28189f22c8e8a373ffb0fe69329a83babb777a53d4f73c87e3ae1ba54cd3e0fcac25b62ce19e55505ce6d602d SHA512 f6c0f2910974cfb42cf748287bed94281cc7753c2632dd4fa4dc6baa0c261d1c408f792c259c4d66251a6449698aa9dcae8690b9f5aea687f73868571d9a48a6
+MISC metadata.xml 424 BLAKE2B f6ce8f7bf4047dcb6cfdaf4c9098ce2a7b8b6ac9341afaa91b839e0872ed6db91228a145ba0b26ad733d1c857e251f17e986cd0872fab48b53ef0c289d790d31 SHA512 a2cefaa9364f67641cf69209942c6803cda0019d59019fdb022908b87d16f33776bd40d4ac484a2913f6f48906863deeab7a067c9c6715b1a15124c2cf926629
diff --git a/x11-apps/mesa-progs/files/mesa-progs-8.4.0-improve-printing.patch b/x11-apps/mesa-progs/files/mesa-progs-8.4.0-improve-printing.patch
deleted file mode 100644
index ffc4d3fa28d7..000000000000
--- a/x11-apps/mesa-progs/files/mesa-progs-8.4.0-improve-printing.patch
+++ /dev/null
@@ -1,289 +0,0 @@
-From aa9e66f2d1e96937c56e4141bf8c966a8a59983f Mon Sep 17 00:00:00 2001
-From: Brian Paul <brianp@vmware.com>
-Date: Wed, 28 Feb 2018 11:14:34 -0700
-Subject: [PATCH 1/4] glxinfo/wglinfo: remove print_shader_limits() code
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-And add queries of GL 2.0 limits.  All the VS, FS, GS limits which were
-reported with print_shader_limits() are also covered by the GL 2.0 and
-3.2 queries.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105285
-Reviewed-by: Mathias Fröhlich <mathias.froehlich@web.de>
-Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
----
- src/xdemos/glinfo_common.c | 89 +++++---------------------------------
- 1 file changed, 11 insertions(+), 78 deletions(-)
-
-diff --git a/src/xdemos/glinfo_common.c b/src/xdemos/glinfo_common.c
-index 3668026b..7ffbeac5 100644
---- a/src/xdemos/glinfo_common.c
-+++ b/src/xdemos/glinfo_common.c
-@@ -378,74 +378,6 @@ struct token_name
- };
- 
- 
--static void
--print_shader_limit_list(const struct token_name *lim)
--{
--   GLint max[1];
--   unsigned i;
--
--   for (i = 0; lim[i].token; i++) {
--      glGetIntegerv(lim[i].token, max);
--      if (glGetError() == GL_NO_ERROR) {
--	 printf("        %s = %d\n", lim[i].name, max[0]);
--      }
--   }
--}
--
--
--/**
-- * Print interesting limits for vertex/fragment shaders.
-- */
--static void
--print_shader_limits(GLenum target)
--{
--   static const struct token_name vertex_limits[] = {
--      { GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB, "GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB" },
--      { GL_MAX_VARYING_FLOATS_ARB, "GL_MAX_VARYING_FLOATS_ARB" },
--      { GL_MAX_VERTEX_ATTRIBS_ARB, "GL_MAX_VERTEX_ATTRIBS_ARB" },
--      { GL_MAX_TEXTURE_IMAGE_UNITS_ARB, "GL_MAX_TEXTURE_IMAGE_UNITS_ARB" },
--      { GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB, "GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB" },
--      { GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB, "GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB" },
--      { GL_MAX_TEXTURE_COORDS_ARB, "GL_MAX_TEXTURE_COORDS_ARB" },
--      { GL_MAX_VERTEX_OUTPUT_COMPONENTS  , "GL_MAX_VERTEX_OUTPUT_COMPONENTS  " },
--      { (GLenum) 0, NULL }
--   };
--   static const struct token_name fragment_limits[] = {
--      { GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB, "GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB" },
--      { GL_MAX_TEXTURE_COORDS_ARB, "GL_MAX_TEXTURE_COORDS_ARB" },
--      { GL_MAX_TEXTURE_IMAGE_UNITS_ARB, "GL_MAX_TEXTURE_IMAGE_UNITS_ARB" },
--      { GL_MAX_FRAGMENT_INPUT_COMPONENTS , "GL_MAX_FRAGMENT_INPUT_COMPONENTS " },
--      { (GLenum) 0, NULL }
--   };
--   static const struct token_name geometry_limits[] = {
--      { GL_MAX_GEOMETRY_UNIFORM_COMPONENTS, "GL_MAX_GEOMETRY_UNIFORM_COMPONENTS" },
--      { GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS, "GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS" },
--      { GL_MAX_GEOMETRY_OUTPUT_VERTICES  , "GL_MAX_GEOMETRY_OUTPUT_VERTICES  " },
--      { GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS, "GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS" },
--      { GL_MAX_GEOMETRY_INPUT_COMPONENTS , "GL_MAX_GEOMETRY_INPUT_COMPONENTS " },
--      { GL_MAX_GEOMETRY_OUTPUT_COMPONENTS, "GL_MAX_GEOMETRY_OUTPUT_COMPONENTS" },
--      { (GLenum) 0, NULL }
--   };
--
--   switch (target) {
--   case GL_VERTEX_SHADER:
--      printf("    GL_VERTEX_SHADER_ARB:\n");
--      print_shader_limit_list(vertex_limits);
--      break;
--
--   case GL_FRAGMENT_SHADER:
--      printf("    GL_FRAGMENT_SHADER_ARB:\n");
--      print_shader_limit_list(fragment_limits);
--      break;
--
--   case GL_GEOMETRY_SHADER:
--      printf("    GL_GEOMETRY_SHADER:\n");
--      print_shader_limit_list(geometry_limits);
--      break;
--   }
--}
--
--
- /**
-  * Print interesting limits for vertex/fragment programs.
-  */
-@@ -627,7 +559,17 @@ print_limits(const char *extensions, const char *oglstring, int version,
-       { 1, GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS, "GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS", "GL_ARB_tessellation_shader" },
-       { 1, GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS, "GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS", "GL_ARB_tessellation_shader" },
- #endif
--
-+#if defined(GL_VERSION_2_0)
-+      { 1, GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, "GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS", "2.0" },
-+      { 1, GL_MAX_DRAW_BUFFERS, "GL_MAX_DRAW_BUFFERS", "2.0" },
-+      { 1, GL_MAX_FRAGMENT_UNIFORM_COMPONENTS, "GL_MAX_FRAGMENT_UNIFORM_COMPONENTS", "2.0" },
-+      { 1, GL_MAX_TEXTURE_COORDS, "GL_MAX_TEXTURE_COORDS", "2.0" },
-+      { 1, GL_MAX_TEXTURE_IMAGE_UNITS, "GL_MAX_TEXTURE_IMAGE_UNITS", "2.0" },
-+      { 1, GL_MAX_VARYING_FLOATS, "GL_MAX_VARYING_FLOATS", "2.0" },
-+      { 1, GL_MAX_VERTEX_ATTRIBS, "GL_MAX_VERTEX_ATTRIBS", "2.0" },
-+      { 1, GL_MAX_VERTEX_UNIFORM_COMPONENTS, "GL_MAX_VERTEX_UNIFORM_COMPONENTS", "2.0" },
-+      { 1, GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, "GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS", "2.0" },
-+#endif
- #if defined(GL_VERSION_3_0)
-       { 1, GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS, "GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS", "3.0" },
-       { 1, GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS, "GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS", "3.0" },
-@@ -819,15 +761,6 @@ print_limits(const char *extensions, const char *oglstring, int version,
-       print_program_limits(GL_FRAGMENT_PROGRAM_ARB, extfuncs);
-    }
- #endif
--   if (extension_supported("GL_ARB_vertex_shader", extensions)) {
--      print_shader_limits(GL_VERTEX_SHADER_ARB);
--   }
--   if (extension_supported("GL_ARB_fragment_shader", extensions)) {
--      print_shader_limits(GL_FRAGMENT_SHADER_ARB);
--   }
--   if (version >= 32) {
--      print_shader_limits(GL_GEOMETRY_SHADER);
--   }
- }
- 
- 
--- 
-2.19.2
-
-From 9804a083feb676cf810905a6826f708f54a15be2 Mon Sep 17 00:00:00 2001
-From: Brian Paul <brianp@vmware.com>
-Date: Wed, 28 Feb 2018 11:19:43 -0700
-Subject: [PATCH 2/4] glxinfo/wglinfo: fix VP/FP strings, indentation
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Print extensions string instead of program target.
-Use less indentation to match other sections.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105285
-Reviewed-by: Mathias Fröhlich <mathias.froehlich@web.de>
-Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
----
- src/xdemos/glinfo_common.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/xdemos/glinfo_common.c b/src/xdemos/glinfo_common.c
-index 7ffbeac5..57dccc82 100644
---- a/src/xdemos/glinfo_common.c
-+++ b/src/xdemos/glinfo_common.c
-@@ -419,10 +419,10 @@ print_program_limits(GLenum target,
-    int i;
- 
-    if (target == GL_VERTEX_PROGRAM_ARB) {
--      printf("    GL_VERTEX_PROGRAM_ARB:\n");
-+      printf("  GL_ARB_vertex_program:\n");
-    }
-    else if (target == GL_FRAGMENT_PROGRAM_ARB) {
--      printf("    GL_FRAGMENT_PROGRAM_ARB:\n");
-+      printf("  GL_ARB_fragment_program:\n");
-    }
-    else {
-       return; /* something's wrong */
-@@ -431,14 +431,14 @@ print_program_limits(GLenum target,
-    for (i = 0; common_limits[i].token; i++) {
-       extfuncs->GetProgramivARB(target, common_limits[i].token, max);
-       if (glGetError() == GL_NO_ERROR) {
--         printf("        %s = %d\n", common_limits[i].name, max[0]);
-+         printf("    %s = %d\n", common_limits[i].name, max[0]);
-       }
-    }
-    if (target == GL_FRAGMENT_PROGRAM_ARB) {
-       for (i = 0; fragment_limits[i].token; i++) {
-          extfuncs->GetProgramivARB(target, fragment_limits[i].token, max);
-          if (glGetError() == GL_NO_ERROR) {
--            printf("        %s = %d\n", fragment_limits[i].name, max[0]);
-+            printf("    %s = %d\n", fragment_limits[i].name, max[0]);
-          }
-       }
-    }
--- 
-2.19.2
-
-From 6a7cee63b714699b98a31b3e57039d26506465ae Mon Sep 17 00:00:00 2001
-From: Brian Paul <brianp@vmware.com>
-Date: Mon, 5 Mar 2018 09:37:17 -0700
-Subject: [PATCH 3/4] glxinfo/wglinfo: print (110) instead of empty line
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The GL_SHADING_LANGUAGE_VERSION query returns an empty string for
-GLSL 1.10.  Instead of printing an empty line, print (110).
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105285
-Reviewed-by: Mathias Fröhlich <mathias.froehlich@web.de>
-Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
----
- src/xdemos/glinfo_common.c | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/src/xdemos/glinfo_common.c b/src/xdemos/glinfo_common.c
-index 57dccc82..a8ec12e7 100644
---- a/src/xdemos/glinfo_common.c
-+++ b/src/xdemos/glinfo_common.c
-@@ -745,8 +745,17 @@ print_limits(const char *extensions, const char *oglstring, int version,
-       glGetIntegerv(GL_NUM_SHADING_LANGUAGE_VERSIONS, &n);
-       printf("    GL_NUM_SHADING_LANGUAGE_VERSIONS = %d\n", n);
-       for (i = 0; i < n; i++) {
--         printf("      %s\n", (const char *)
--                extfuncs->GetStringi(GL_SHADING_LANGUAGE_VERSION, i));
-+         const char *lang = (const char *)
-+            extfuncs->GetStringi(GL_SHADING_LANGUAGE_VERSION, i);
-+         if (lang[0] == 0) {
-+            /* The empty string is really GLSL 1.10.  Instead of
-+             * printing an empty line, print (110).  For more info,
-+             * see the GL 4.3 compatibility profile specification,
-+             * page 628.
-+             */
-+            lang = "(110)";
-+         }
-+         printf("      %s\n", lang);
-       }
-    }
- #endif
--- 
-2.19.2
-
-From 27a0e5af804b3d28c51bd05ad38d25a2c8b4112d Mon Sep 17 00:00:00 2001
-From: Brian Paul <brianp@vmware.com>
-Date: Mon, 5 Mar 2018 09:44:41 -0700
-Subject: [PATCH 4/4] glxinfo/wglinfo: improve GL_ARB_imaging query code
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Print GL_MAX_CONVOLUTION_WIDTH, HEIGHT on separate lines.
-Print GL_MAX_COLOR_MATRIX_STACK_DEPTH in same section.
-
-Reviewed-by: Mathias Fröhlich <mathias.froehlich@web.de>
-Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
----
- src/xdemos/glinfo_common.c | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/src/xdemos/glinfo_common.c b/src/xdemos/glinfo_common.c
-index a8ec12e7..92467d67 100644
---- a/src/xdemos/glinfo_common.c
-+++ b/src/xdemos/glinfo_common.c
-@@ -464,7 +464,6 @@ print_limits(const char *extensions, const char *oglstring, int version,
-       { 1, GL_MAX_ATTRIB_STACK_DEPTH, "GL_MAX_ATTRIB_STACK_DEPTH", NULL },
-       { 1, GL_MAX_CLIENT_ATTRIB_STACK_DEPTH, "GL_MAX_CLIENT_ATTRIB_STACK_DEPTH", NULL },
-       { 1, GL_MAX_CLIP_PLANES, "GL_MAX_CLIP_PLANES", NULL },
--      { 1, GL_MAX_COLOR_MATRIX_STACK_DEPTH, "GL_MAX_COLOR_MATRIX_STACK_DEPTH", "GL_ARB_imaging" },
-       { 1, GL_MAX_ELEMENTS_VERTICES, "GL_MAX_ELEMENTS_VERTICES", NULL },
-       { 1, GL_MAX_ELEMENTS_INDICES, "GL_MAX_ELEMENTS_INDICES", NULL },
-       { 1, GL_MAX_EVAL_ORDER, "GL_MAX_EVAL_ORDER", NULL },
-@@ -716,12 +715,16 @@ print_limits(const char *extensions, const char *oglstring, int version,
- 
-    /* these don't fit into the above mechanism, unfortunately */
-    if (extension_supported("GL_ARB_imaging", extensions)) {
-+      GLint d;
-+      printf("  GL_ARB_imaging:\n");
-       extfuncs->GetConvolutionParameteriv(GL_CONVOLUTION_2D,
--                                          GL_MAX_CONVOLUTION_WIDTH, max);
-+                                          GL_MAX_CONVOLUTION_WIDTH, &d);
-+      printf("    GL_MAX_CONVOLUTION_WIDTH = %d\n", d);
-       extfuncs->GetConvolutionParameteriv(GL_CONVOLUTION_2D,
--                                          GL_MAX_CONVOLUTION_HEIGHT, max+1);
--      printf("  GL_ARB_imaging:\n");
--      printf("    GL_MAX_CONVOLUTION_WIDTH/HEIGHT = %d, %d\n", max[0], max[1]);
-+                                          GL_MAX_CONVOLUTION_HEIGHT, &d);
-+      printf("    GL_MAX_CONVOLUTION_HEIGHT = %d\n", d);
-+      glGetIntegerv(GL_MAX_COLOR_MATRIX_STACK_DEPTH, &d);
-+      printf("    GL_MAX_COLOR_MATRIX_STACK_DEPTH = %d\n", d);
-    }
- 
-    if (extension_supported("GL_ARB_texture_compression", extensions)) {
--- 
-2.19.2
-
diff --git a/x11-apps/mesa-progs/mesa-progs-8.4.0-r1.ebuild b/x11-apps/mesa-progs/mesa-progs-8.4.0-r1.ebuild
deleted file mode 100644
index 010a242b8c96..000000000000
--- a/x11-apps/mesa-progs/mesa-progs-8.4.0-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/progs/demos}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/ https://gitlab.freedesktop.org/mesa/demos"
-if [[ ${PV} = 9999* ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/demos.git"
-	EGIT_CHECKOUT_DIR="${S}"
-	EXPERIMENTAL="true"
-else
-	SRC_URI="https://mesa.freedesktop.org/archive/demos/${MY_P}.tar.bz2
-		https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${MY_P}"
-fi
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="egl gles2"
-
-RDEPEND="
-	media-libs/mesa[egl(+)?,gles2?]
-	virtual/opengl
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	media-libs/glew
-	virtual/glu
-	x11-base/xorg-proto"
-BDEPEND="sys-apps/grep
-	sys-apps/file"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-improve-printing.patch
-)
-
-src_prepare() {
-	default
-	[[ ${PV} = 9999* ]] && eautoreconf
-}
-
-src_compile() {
-	emake -C src/xdemos glxgears glxinfo
-
-	if use egl; then
-		emake LDLIBS="-lEGL" -C src/egl/opengl/ eglinfo
-		emake -C src/egl/eglut/ libeglut_x11.la
-		emake LDLIBS="-lGL -lEGL -lX11 -lm" -C src/egl/opengl/ eglgears_x11
-
-		if use gles2; then
-			emake LDLIBS="-lGLESv2 -lEGL -lX11" -C src/egl/opengles2/ es2_info
-			emake LDLIBS="-lGLESv2 -lEGL -lX11 -lm" -C src/egl/opengles2/ es2gears_x11
-		fi
-	fi
-}
-
-src_install() {
-	local demo='src/xdemos'
-	if use egl; then
-		demo="${demo} src/egl/opengl"
-
-		use gles2 && demo="${demo} src/egl/opengles2"
-	fi
-
-	# Ensure only the binaries are installed and not a similarly named wrapper script
-	find ${demo} -type f -print0 |
-		xargs -0 file | grep executable | grep ELF | cut -f 1 -d : |
-		xargs -I '{}' dobin '{}' || die
-}
diff --git a/x11-apps/mesa-progs/metadata.xml b/x11-apps/mesa-progs/metadata.xml
index 9fe2ef9afb4a..0fd718e741b6 100644
--- a/x11-apps/mesa-progs/metadata.xml
+++ b/x11-apps/mesa-progs/metadata.xml
@@ -6,7 +6,6 @@
         <name>X11</name>
     </maintainer>
     <use>
-        <flag name="egl">Build EGL utilities</flag>
         <flag name="gles2">Build OpenGL ES 2 utilities</flag>
     </use>
     <upstream>
diff --git a/x11-apps/xclipboard/Manifest b/x11-apps/xclipboard/Manifest
index 74a2c5617a05..505bae30ceb7 100644
--- a/x11-apps/xclipboard/Manifest
+++ b/x11-apps/xclipboard/Manifest
@@ -1,5 +1,3 @@
-DIST xclipboard-1.1.3.tar.bz2 132406 BLAKE2B 5e2e77a297c32884cadc4bf6e4503a958218b11083c747a575bb05dd8218fd0759edcab5c8d12055f5b0a1875e8a2cfb6b2062795580358521b619ecca8d70d8 SHA512 84a51d11851756422eb23e67b2721d2bcb2ac248fa32c0837423b6169144dff76717c22611ad3c93633e09a44dc70c847a2470d3988eff0b24d77e252a4e147e
 DIST xclipboard-1.1.4.tar.xz 128912 BLAKE2B f90906d3abb2de0915113d651d5bd4c4cf2a75c4b15c681a7609cd9aa46ce9d3157cdfa5f60ad76ce6a56396d51ae726645b1b43d53125161f362cc3520b6a66 SHA512 efa7800e0c4fb0242362c4263d80182d591bded07d1064a36b157b6202b15b0c82f083658ced2b82392eca905fb57c04a537d67e75c1237a1667ed2ce0cb09fe
-EBUILD xclipboard-1.1.3.ebuild 374 BLAKE2B 6e40ffedc8a81c49ce8953941548802716fdc79953f5fb76cdc434183d8fabb1652e680ac28d5aa307b0a482d302dff85be5cd86f1358b530452dab805a69236 SHA512 29687d418e81b54e582f6ed87d7595bf92f841bc917447d597f7d540e163191a0069cce24aa84b8b342c0f51223a18f8d747eef87abb35e7a12bb4a52d1053bc
 EBUILD xclipboard-1.1.4.ebuild 420 BLAKE2B 2923cf949a00269262dce0bc452e5b2bb9f30b948f24897a7b4bd3cc8d06a8803072169ab32ce42a0dec2acda7acaaad551f1e78543e222b61d098574866ef50 SHA512 308c804b5ac2332656b0b39e25b2f2a11f7271b719e3aa011969d61bb1ab83fc7d538aa9562ac7d53d3353195c42d1f0a420e0055cfe9d088e6ef3795249ce1a
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xclipboard/xclipboard-1.1.3.ebuild b/x11-apps/xclipboard/xclipboard-1.1.3.ebuild
deleted file mode 100644
index d3e1001b82ea..000000000000
--- a/x11-apps/xclipboard/xclipboard-1.1.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="interchange between cut buffer and selection"
-
-KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86"
-
-RDEPEND="
-	x11-libs/libXaw
-	x11-libs/libxkbfile
-	x11-libs/libXmu
-	>=x11-libs/libXt-1.1
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xcmsdb/Manifest b/x11-apps/xcmsdb/Manifest
index f906119f9b45..2e8b96bdfdd9 100644
--- a/x11-apps/xcmsdb/Manifest
+++ b/x11-apps/xcmsdb/Manifest
@@ -1,5 +1,3 @@
-DIST xcmsdb-1.0.5.tar.bz2 145419 BLAKE2B 41269ca270e4b11838f54669900a074dfbbc7339af84db8638498e220eb7abac2fe055ca003dba326babf368d26137eabc0f0bae9f69233d9c91f7e727c3ba30 SHA512 e47bfce87d7531e7809c300e01120c3e8d6001130d9a6c9f6de5bc19651d8712d273a6f54452223bd8c4bff4612b5ecae8db45eddb022da945ed6e14c9c84ae4
 DIST xcmsdb-1.0.6.tar.xz 136708 BLAKE2B 847a29251d781cf616a7b74abb9130da08d2dd56d42db61923c9e82848bff12ff7c5f8ba3c9635b2a572116bb19ce0637432ea9c6fdaf5b76d7f7ae8e176be64 SHA512 e47d9498ce496effbc44a66e70af91d9fe65c344a17916fd4990a4c84fa8879aa09b6695aeb6ef595f475c16a13c7c31d4c48449234564de7de38d7436764fae
-EBUILD xcmsdb-1.0.5-r1.ebuild 364 BLAKE2B a7567526578b0c7e2476ed93af48df0960622b4c3c9e8dc7a3d08cd4da1ca03e6a1e2475926a5bd06ca5ac20e47fb41ab23af28928a4ffa7683ca83dee0aab6f SHA512 4ecb316d2dfac00c201b31606ed7fb17207fab7201cb951027178f847a1d095bbeb252ee1025a38b42de57992bc4393be5c67a7bae4ea2496031bd75a0f20b2f
 EBUILD xcmsdb-1.0.6.ebuild 389 BLAKE2B 48c027e97c6ccfd76cc5d9c91d04a15ee5560c29dcd8922d6fe6fd0e74cd0c5481f15fbd47f1b289fc26f94e03e4e3d9dd9402caabf5e9e1a69158fc111f904f SHA512 12808cda2acb89e7415111694fee74ce6d5d435f53887e3632d2b454120bdfc8703c20132ebce67cc85eaac8db895b6f5fe96084530b27e4b3eb4d7b634e7b79
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xcmsdb/xcmsdb-1.0.5-r1.ebuild b/x11-apps/xcmsdb/xcmsdb-1.0.5-r1.ebuild
deleted file mode 100644
index ba0be52c6a13..000000000000
--- a/x11-apps/xcmsdb/xcmsdb-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="Device Color Characterization utility for X Color Management System"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xconsole/Manifest b/x11-apps/xconsole/Manifest
index ef136dc16ca1..c814060f304f 100644
--- a/x11-apps/xconsole/Manifest
+++ b/x11-apps/xconsole/Manifest
@@ -1,5 +1,3 @@
-DIST xconsole-1.0.7.tar.bz2 134832 BLAKE2B 20f9729d0aad2aceb1c7197b2ae45f65088dc39fb5980eb41a39935fb180ee7181c560ef180b0413b28adf36882a13fbdbd454d8b6dbb0cc06f69632f903b546 SHA512 89f391058ea99904587bd1dac9e31fa3ff06cf63b899abe6c06e4897bbc9919500dd4773873b1a452de4f54cc6999bd496022b6d8df9d4147804448abbdca2f9
 DIST xconsole-1.0.8.tar.xz 129336 BLAKE2B 3c00072944594b02d5cbc88e8243198502a1a418e4f0c3e86badf659a62bada126323af1b21517368fd6a6204397714cb8769b7a1702fe9b8d884c057cc429ee SHA512 93fd8527abed4faaf0f6a3804ab08dbcb926b0aaf67fd814c003b6b1102e2f643be5362a020c7028ae928925ffd423df6eb456d4ed48cf30a4c5f00a7ce648fa
-EBUILD xconsole-1.0.7.ebuild 371 BLAKE2B 5909ea5f555dcee4736c71fabda1a34ec3a93b16e1a7aad111371eae8dbcde98474f465323d6dd5c031526a3dc30f240438c9b27a9281750be8af3dbe7c83cb3 SHA512 6b4fd7597cd7ba96439d6fc2edc1775135eb8779089221c9914f91d5ff08df4d9d89de1ea709561d8b71af7dda8f2ed941a6c25825d63e443eff826986e58dba
 EBUILD xconsole-1.0.8.ebuild 419 BLAKE2B fd63c1006a342cc8522cf0dba9b36c5dd0b8309e46f0d4b225b764385605bf3ee7f06520a2e70715240b122d25a6239175f9e647c030499970b26b74ad198894 SHA512 b0590750503fc57970966019ba65d8cef3d45697e1044dd7c6f09f47fc9a54cf9a6cc119e64f19953d4d3b80a3946080dddc78d5d88e48f922903fe15035d254
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xconsole/xconsole-1.0.7.ebuild b/x11-apps/xconsole/xconsole-1.0.7.ebuild
deleted file mode 100644
index df6462f0b88a..000000000000
--- a/x11-apps/xconsole/xconsole-1.0.7.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="monitor system console messages with X"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xev/Manifest b/x11-apps/xev/Manifest
index 433f200d0e86..5e7944cde331 100644
--- a/x11-apps/xev/Manifest
+++ b/x11-apps/xev/Manifest
@@ -1,5 +1,3 @@
-DIST xev-1.2.4.tar.bz2 136792 BLAKE2B 46b38d7295f8a11509598758ece9d880f9c3d303064de5cb6ef12aa9d0b066e78aefd3aa5e0c94ea4af7633936209474be362f9e38c0994eefe798662c2e4c6c SHA512 383472ddbfad639ba46a69080ecdd11a514a0578fd32c463fae18da02e0265c944589eebf12a858994f5fd601c02a0d51517e9b3ff61c6afe740d374f02781ca
 DIST xev-1.2.5.tar.xz 128848 BLAKE2B 468e8b21ffba9473bf04160f053a4300df61280083cdad0d94f2d309abeab96611031cb6d054ab011c4b18c01f63d2e5cd0ab24c5c42ba3e337999716e57851b SHA512 9fbfb78c9547974c2256a678948bf4a694a40b1c2bd5c5dec5f365a713e6d938c6039f055a9629f49de27f02f3d7cb912f07c035df129798a4b2ddc20febe66a
-EBUILD xev-1.2.4.ebuild 387 BLAKE2B 3a2a6e9b12c54a896403d34e070597110fc36ee6507ac28418ec7a10e0697f44dd33aceba1cb53e29d68813d5e53db7f2397aa5ada63f9ac41984ab984ef82f8 SHA512 9a20b20bae3fd657bf7ea16152a09fc37b547346706aaa2bda9fbb2d5e785ba18e15766cdd1ba0194624d4b4ea21e162a0f36cec166f9763e1450b60e99fcdaa
 EBUILD xev-1.2.5.ebuild 406 BLAKE2B 98d216ebb270ee35994ce686659311c1590529ecc32a59a626a3f81de42629a8a6ca85b2da736ab94a7aa4e2b0ec7dda92fceae970cf1b6f8d9645f80484ce78 SHA512 0fcc787ea1a598e64ad2b3a7ddd3e8f77789620cbc435fcfdc10c702283ac7aecfec17dbf6a44d3c67c5988ef4feac886a07f88f334d0174b14e354faca2de5a
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xev/xev-1.2.4.ebuild b/x11-apps/xev/xev-1.2.4.ebuild
deleted file mode 100644
index acc7aaa27433..000000000000
--- a/x11-apps/xev/xev-1.2.4.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="Print contents of X events"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-winnt"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXrandr"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xfontsel/Manifest b/x11-apps/xfontsel/Manifest
index eff16de57bc3..a693c56142d8 100644
--- a/x11-apps/xfontsel/Manifest
+++ b/x11-apps/xfontsel/Manifest
@@ -1,5 +1,3 @@
-DIST xfontsel-1.0.6.tar.bz2 146469 BLAKE2B 9773430e51e63d23086403f91fd78f6ed2e7f3abf144fda5bba171d05145026d233474e9d055b31bd498a861994c4f59af52a8101fc1e10b891ea879cb2f0bb9 SHA512 2f6bc51549a302404cdaf9a5a825add383953fcbb2a0c7076691cefd4dd7e4a3c772c047be74101c8486f75d03ce0bd3e65ede14e91732cf2a932810441c9099
 DIST xfontsel-1.1.0.tar.xz 139560 BLAKE2B e4cb8f25b64e1feb68cdf7ae7982c8e8e6086fb6ad31019b115986220cd9f347edbe738d8d43d0650fd783ef96d2e93a247e462611b0fb33a3aa0a6dc2d2529e SHA512 be67d223668431c9b5dd2ef74032d2f087be5f8f0ccc427bc7ee43e7ce42214edddb07d8c3d6d6de93ea35314392d384f1ab1ae5c48b2cfbce418610e3945a52
-EBUILD xfontsel-1.0.6.ebuild 401 BLAKE2B ba8740496a607caa61135c5f6dab8ac592570c3a459eb62bd95e3193c000bcf8697720975e838926d9e00cc4ee3a45c6b6759424f931e7a654ee907bf69a3099 SHA512 1651e4ec5a34d950811a3bf9c9374b4b7be45324d6f6efd4d00eae96be44ef8a613fc69082a4d7c70152f38465dec48683e08f0e2fa01f1f1c04e1da16cbd919
 EBUILD xfontsel-1.1.0.ebuild 447 BLAKE2B 2c6a91964a850f34f46ea2375f9955ab12de41d88664f39523cc583c958b42b3c194dcc887b41671561625999822d4246d5a5bf75f9608fa210087e2d72b79c5 SHA512 c09d5cb6d42750f582330a0deecfb80035be97d9212e210cc16f18b6a3119c465eb70850ac58f20635820b58cabc967db68edba14f09c864dd60f46e77b35377
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xfontsel/xfontsel-1.0.6.ebuild b/x11-apps/xfontsel/xfontsel-1.0.6.ebuild
deleted file mode 100644
index edca0997fc9b..000000000000
--- a/x11-apps/xfontsel/xfontsel-1.0.6.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="point and click selection of X11 font names"
-
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	x11-libs/libXaw
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xkbutils/Manifest b/x11-apps/xkbutils/Manifest
index 466e616f76d6..3cfbc63fe442 100644
--- a/x11-apps/xkbutils/Manifest
+++ b/x11-apps/xkbutils/Manifest
@@ -1,5 +1,3 @@
-DIST xkbutils-1.0.4.tar.bz2 131269 BLAKE2B 20e51a33b280bf4eaf6dfb3b2986ffdb09d1bb4fe3dd3689de5256204cc0e90808367b0afc054e2b5a6746b3b125bc0d20337761e1714c069f3c300a65fddb06 SHA512 5bb6cb52ac02a4ec18332559853815585ca86e00e8c6452483af10c4db75811fe00952575dbbad5b7d03b9d6498830fb45d617b1b3c5c1cea8445f1131856a4d
 DIST xkbutils-1.0.5.tar.xz 129344 BLAKE2B ac2572b31638120dd5c5e92497f9cde4b43df7ab0f13882f5f1fbac71084dc112a1f9e34d10adf5a4eb83b1b1636ab2388ae8675be5ac1048a3913ac7b0d7f53 SHA512 0d8d460f5e015e9034292688437511068dab61216c2493f2981cfb63aaa012976ac9435c1586a22c0940fbfcb779b48dce9b85832303fe2b854aa945b814ac77
-EBUILD xkbutils-1.0.4-r1.ebuild 357 BLAKE2B 91ad87fa648ae3520b0a140b7c9cdc29ae09f78e06deb88d4a3f261d146824c2016316e528f91386f2b0149f388707536f439684a6cbea1d05137fd3880e2b5c SHA512 795a2f878e3795267bd150bdbdb8a27dac5b169e1c2103250eff0f94cde0b5e6142b0a5fb81963e2b6f50f36c42187bad9c406947ddb2748cfde7831d417cf13
 EBUILD xkbutils-1.0.5.ebuild 384 BLAKE2B 44b1fa6c0cf58369132f2b25969977ab746a98e3e2e6e0a5efb3a4f1ac48aaeee184e5d75f3248fa94ae1408daff4408231c263b4d75074e146f6042f8bb9625 SHA512 46fe3a2533c28cfc699096c8229595794e64a63d0c08946727d23931878b92ed72226be7ce8afd66781814209487c6ff50ea7e322e82a3fa1642174242e51218
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xkbutils/xkbutils-1.0.4-r1.ebuild b/x11-apps/xkbutils/xkbutils-1.0.4-r1.ebuild
deleted file mode 100644
index 1aa7f2ab91f0..000000000000
--- a/x11-apps/xkbutils/xkbutils-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="X.Org xkbutils application"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXaw"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xmag/Manifest b/x11-apps/xmag/Manifest
index 2b275f90dc97..8f30ede91e1f 100644
--- a/x11-apps/xmag/Manifest
+++ b/x11-apps/xmag/Manifest
@@ -1,5 +1,3 @@
-DIST xmag-1.0.6.tar.bz2 143112 BLAKE2B f53d7f564c71100e5903c19ee86aae3405cbc56258c89a5ad3d5e583649e1c2a862fef875c6de18c462e103da2afcd4fcfc9927188e7a4e8b980c7d80b2c4c64 SHA512 98f3c8e0c58f31cd4f1736ba9c5cd68dba3b2e2de6191988de8ae3e91b1d310803461840189ad56be45ee57c9ca05a2c63544a49b02ce6f79f2ebc14c59613de
 DIST xmag-1.0.7.tar.xz 137660 BLAKE2B aa809a5e36d5e05524ab78d2382e15b2294439927ee7b441d246134120cef360fc2eb32b0611874a4bc4b45613a8e0fcc0e6cd595fea3fbd5a919aba593d90d9 SHA512 d35ac5d977b9f3bd03fb919bf178f68bdbc6ef2a57915b407d836fce0582f5cb78d0b79043bb6f8d015464ca113deb09469c3b724aed03901a4c3fc4a9982984
-EBUILD xmag-1.0.6.ebuild 325 BLAKE2B cd8d45f91f7bf0bdb71d1e271706a0108c8792450975cf54c30b577624000c83a7e55e18089106bc2169cd1c79b30ff6e8cd21e14ab56a418aefac8d09a00981 SHA512 fecd2fcc9d1aa206ef66f34fd3b244ca2d10089f5c195446dd408f7b329078d681ef48ebc8717561dd0faadfd32ec1681ba40ec160dd0bf74ee0eba7b9436916
 EBUILD xmag-1.0.7.ebuild 371 BLAKE2B 85180d710e56b6558bf7a10d1a1b633bffd062869ad6646c57ab3cf1dbba186172da678519020d64a218dc9497a5526cf4129197b8ba93152309493decd60437 SHA512 182c6f1acd43374e5e6b79dea9b6085946eecdbffce4b07b7d66a42ecfd5453b3b9549f8944e2891ab3104b808dd784f09147aec44b1ca5e6c502c87984b3dec
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xmag/xmag-1.0.6.ebuild b/x11-apps/xmag/xmag-1.0.6.ebuild
deleted file mode 100644
index 4f865e46ee3d..000000000000
--- a/x11-apps/xmag/xmag-1.0.6.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="X.Org xmag application"
-
-KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86"
-
-RDEPEND="
-	x11-libs/libXaw
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmessage/Manifest b/x11-apps/xmessage/Manifest
index bd8b6c3aebcc..bf3821e9ef9c 100644
--- a/x11-apps/xmessage/Manifest
+++ b/x11-apps/xmessage/Manifest
@@ -1,5 +1,3 @@
-DIST xmessage-1.0.5.tar.bz2 133393 BLAKE2B afa42e20ba995fa1086cd3cee5b90be8564c521f7bc12b544a787cc753782e1cfdbc5a94f5925f5bae1b630b7ac08fcaeee59e319f680d3be29c46d5421aa048 SHA512 a8423c3986b1576fa67800c315a605a527bb9a8f594ac269a736ae7b91eed0d4d83deb89148197dc3cd3f0e51894146958ce2979f78e97dcdb99c5326e34dabe
 DIST xmessage-1.0.6.tar.xz 126324 BLAKE2B f818af4d7a17c2da6e00fbc00622606153b74bccb809ccc42226a0be3d6f19840c3a20278fe2d73f4af1e624b37a4c086c81650ab9262a1692e6d3ab5d5b1764 SHA512 89deb7a81bd047027f99cb92cd16a47f94479c61a6f9fbac4638e6d642037b3e9bbac2313db59ac8c5544175947c693f6a210537c6df2b88dc3de1c67498cba8
-EBUILD xmessage-1.0.5-r1.ebuild 468 BLAKE2B 1852aa88e19d0042a7362de224baf8ad1d1c24525d1eb8bf1e490e9d79621c7ffa677b542a89ea90102e93427910da547bbd4d9c2269b9791b790a34dc32804a SHA512 5b05840df386b9b1ebdd5c2c69336cc2f14159d7bcf3de0722f14f5b64c3e296cc21f4c08783187ec265915b21801971010b7c2df5d5b6d1e51453f3e46c181c
 EBUILD xmessage-1.0.6.ebuild 516 BLAKE2B fcc6ee13831cd1750d32ec60c4d12a3a825b471cdf14e2c0389402b01338480a87fc0dbb7f72ef41d65f39aa2fab8d4b25aa01aea5b087738b6d4a7ae60960d4 SHA512 cba9fd0c005eb501387a08a826f4c691af3110aa709bc0a108554e7d0e6e1b89b781230acaf9ced90f61c3cfd504100b1b92f06e053768ed372302c02cd7452b
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xmessage/xmessage-1.0.5-r1.ebuild b/x11-apps/xmessage/xmessage-1.0.5-r1.ebuild
deleted file mode 100644
index bb21a217c7f0..000000000000
--- a/x11-apps/xmessage/xmessage-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="display a message or query in a window (X-based /bin/echo)"
-
-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"
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libXt"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmodmap/Manifest b/x11-apps/xmodmap/Manifest
index 38eda187a377..6b32cc7e56e7 100644
--- a/x11-apps/xmodmap/Manifest
+++ b/x11-apps/xmodmap/Manifest
@@ -1,5 +1,3 @@
-DIST xmodmap-1.0.10.tar.bz2 145489 BLAKE2B 503e72882a1d6d5c916cb60b898156adbdccc3e90bda85b161ac7a57ee607605331be73bd779603cfab1013d065e28f3165cce2ef50d71579330ab0361078a22 SHA512 324c7dcef843186088f16b3bc47485eb3c9b4331e56ce43b692deb4bb3d4f4f27512480e91a379cceac8383df920dc5e37cd825246b50b6343291cec48134c04
 DIST xmodmap-1.0.11.tar.xz 139532 BLAKE2B d50611e762b665b18c370ea49d981d7820f16e2e10450bbb2ebc76c867a3a4e75d68e7dacfb9e610849770afa95f4d757863953217aac8e13509b386bdb8131d SHA512 a78f916f048d2017f079733becc99232c087c360ece61ec6c4fa4b5b130b96a1b10c4ce1b64a15bdcab7ea05de3c7f16035503d5be6f8ce1a7612ce71d558510
-EBUILD xmodmap-1.0.10.ebuild 419 BLAKE2B 67b1ed4c7376fdc1ea97831987bdfa2d2836fd03a78aceede1071a843a202a802dfdd72ceb50bf1c889ee119952c7ebd9b90c38c58267ae92a139b0dcbfdf8e8 SHA512 301c12a54574befc3245365955bb02c7eabf6978c1912c80ccd6bb2bf933f9f76d2019c189fb9643979fb2f7caa6005c246c72d60dbca2fad80a42e2ebf89048
 EBUILD xmodmap-1.0.11.ebuild 457 BLAKE2B 12b5fee276a2105e56199ee04900cab1ce6721770dec0f8f91ab3b83be69fad63ac4153475a4c67dbe9a263ddc2994139202114b64930f4913033122f87e3df6 SHA512 f23b5aebafa9ad07d22aa64a0d8f8ce836ff9eafa808afc29dddac93a4ef6c82e8037401e5a940ece1932491b5a8c55f14e5a58551dfb46c4535cf770acff4c3
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xmodmap/xmodmap-1.0.10.ebuild b/x11-apps/xmodmap/xmodmap-1.0.10.ebuild
deleted file mode 100644
index 99183c2a5a09..000000000000
--- a/x11-apps/xmodmap/xmodmap-1.0.10.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="utility for modifying keymaps and pointer button mappings in X"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xpr/Manifest b/x11-apps/xpr/Manifest
index 06f9195beb42..cc2529a15070 100644
--- a/x11-apps/xpr/Manifest
+++ b/x11-apps/xpr/Manifest
@@ -1,5 +1,3 @@
-DIST xpr-1.0.5.tar.bz2 150714 BLAKE2B 89d20134a3a9a12e319d343ae20c3aac71d1d2d2cbbffe1ff71375211efb3a4b22c2d99099fb1621fba838778702cca8c088181218c5d2c5fcb6af706d23b359 SHA512 d5dfb936ec4ad0067d02654dec8e862fe337ff6a2c2f974b2b3a612a829c2e728a0d51e7aba00ed2a94dc96dc50cc69f2c59f522e0635013f5f4f5bb3f4ab967
 DIST xpr-1.1.0.tar.xz 140244 BLAKE2B b3525415b18615abe489466965fa414ee343d0ea2ebbad4e75e943a0e19fc29cb2a2cce4fde07c345d84f2c53eeb47c0162719d7322a93ddacfa80452153f45b SHA512 53eb896cf1844036a13b1018ffcecbc6a0a56eebe0d7cb6331dbe691207498d2c41f3791655b7fc081acfef2ed9904987f363b710bf0eeff6c8d33f819a951cb
-EBUILD xpr-1.0.5-r1.ebuild 337 BLAKE2B 79b9ee3cd7fbd51e01ada31a92e5fc9ace1bb404d67db3b977913422484a0d4b54a0cd79294527ecaa32c3a407581cdf2e87e681ce7022881c53b4fe7c5450a4 SHA512 385345d803a59c5fa6c7429b0c196b9cc981cd591c8095e260a3e216e506da2db2dc1a8c236a76928ebd144e61c1ab331e8a019e9ac4c314a5a44d9cabe898eb
 EBUILD xpr-1.1.0.ebuild 362 BLAKE2B 191f10bb12796814557f38b81520d51fbea17d2c1157ba5fd2b5ad2ad5ac7cd2bd1628254568586afc8e72703ce087c8898e702470abfbad9a7856b12647f392 SHA512 7e8594c5509c0efa18d00fae5d3b9612ee1155af409050234a6c292863dff03d4df20dfcbded5668454ad62c84880dcbc0635e1dc53daaa50424c18d65147f91
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xpr/xpr-1.0.5-r1.ebuild b/x11-apps/xpr/xpr-1.0.5-r1.ebuild
deleted file mode 100644
index d623564f14e2..000000000000
--- a/x11-apps/xpr/xpr-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="X.Org xpr application"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXmu"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xrefresh/Manifest b/x11-apps/xrefresh/Manifest
index 9ba66ebe6e9e..95e60a73ead9 100644
--- a/x11-apps/xrefresh/Manifest
+++ b/x11-apps/xrefresh/Manifest
@@ -1,5 +1,3 @@
-DIST xrefresh-1.0.6.tar.bz2 127494 BLAKE2B 587f5756bbd3095e77494288d4b9cca99992b342bb718e5cadefdfbf018710ce0f216f43b68814d0d0a681c87d855be4ecf199a314361278c3bfdd81e6073f69 SHA512 361e97fecfc2706d5eeab69df0d4dd4baa55b6783cfddabf51d8561b7c930d71ce6c217e0512c6564208d69b04f89c69ea8c0bfb2e4f6cc25b062b55e4db3674
 DIST xrefresh-1.0.7.tar.xz 121820 BLAKE2B c60ffec9e03b1d07b25228b9066b05a437160a48c182988781890f59271b835079af0dd071ce77b56768fffeb0203bb092fbf80c286272c82e56af2c867ae3e0 SHA512 8fcbb01aa368944ca536f050ab194b21bbd6b2a56265a7ed5807882e5c2f9660105283cdba0ea35b3e4a17a015586aeb82906e081da030332dfc49169a191c31
-EBUILD xrefresh-1.0.6-r1.ebuild 331 BLAKE2B f7f6cbfd2a77dbb8d077e6eb8925263917ae547ff40b859623b397b125265a2d4863541fc49d0e0ac0d0a5786ee55664a3a8175508d0ed732730bb5382864ee5 SHA512 b71f02718163a96f0f68549c1010a051c619f96a6b2fae38ac607edcc4f2b4b7cbc232bdb07324cd04ace972040438e65dd824d08f3785199b649f3450420721
 EBUILD xrefresh-1.0.7.ebuild 356 BLAKE2B 2d86ff64182344bee10ad3dd009585f70e0727b99961240e8bc817243af7fa7a79d010ed8af0d0e747f202a736aac0c915e17a17204cad5473c5eb35ad8f810f SHA512 c79598b8dca25b8c6499e92b9dfb4e4d252aa40bd93b372e431dcaafaccc372faa9dffd7e294626016edca735fc632dd430e1780666a418afdcd7ddabc863957
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xrefresh/xrefresh-1.0.6-r1.ebuild b/x11-apps/xrefresh/xrefresh-1.0.6-r1.ebuild
deleted file mode 100644
index 4d3aac2ae853..000000000000
--- a/x11-apps/xrefresh/xrefresh-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="refresh all or part of an X screen"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xwud/Manifest b/x11-apps/xwud/Manifest
index f2d03d7f5bf9..91627ad80b12 100644
--- a/x11-apps/xwud/Manifest
+++ b/x11-apps/xwud/Manifest
@@ -1,5 +1,3 @@
-DIST xwud-1.0.5.tar.bz2 133376 BLAKE2B 27ce8251ae2a2a87393655e1824121dd54f75839a8066405299e9052bf2c55c6946cd686f285dca1d7339029d8ca8b94e4adb3efb485b42bd347db212b12858d SHA512 27a0ce7481978ae6cd94b0d94374af72185e270d68f2496620e148bb00945427c4827138d9efc48745e6382e3da3390ed0cdff7dbd02dcf9706e8ecccae97184
 DIST xwud-1.0.6.tar.xz 126696 BLAKE2B cd272963c7edc71d4d4a0863dacf39a3432f1b344fe90e698d167df1394b7d5f00e3481eaa97fa47d9dd4e18778193b15879fec73746517a4a6ac69b098c1ec3 SHA512 a7b964d9ef13e4726b2ef84dcc1040cdf510c8031c3e6e1dc1c711e65d9e56f1fc5921a7af3dbbd898b861c79e9da6242da23c2e73816e39152ae719052293e9
-EBUILD xwud-1.0.5-r1.ebuild 319 BLAKE2B 718d8d9bb40a81cb4f0a0e95d84e2a8ea2c6fe168c2cca9c32d33532ffcd48fa8f34418b69bd222f3d963908e15ff03f135e3f1627cac071f6a4a0b7556c5d9b SHA512 5a6728e1c179e1ff41535f26f530b300ae67b43bd56266dd1576d17ff1b18fc874aa2e3060827b4fe13ef283a29416cac41ec2b2244d88056a8fd6ddfcfce3a2
 EBUILD xwud-1.0.6.ebuild 344 BLAKE2B e0eb7d0d2d0bf5f5bd0f8237d7ea9ea87b093f6fe71f2d4fa20b5fe8a6bf2940d1d40e1882810c31d7173f559fde2c190a292d9399338f1e13dc71855389aa50 SHA512 876f92170c347392db4046a7270fce99ca70c06e152c64a255b4da6ca96b556138c8f47f323e70eb471e122780e2ba5c87f97a4b94e5f2e3654138f20bd6cafe
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xwud/xwud-1.0.5-r1.ebuild b/x11-apps/xwud/xwud-1.0.5-r1.ebuild
deleted file mode 100644
index 5141330e63a6..000000000000
--- a/x11-apps/xwud/xwud-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="image displayer for X"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 29e60ff738b7..3a231a69b52f 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xcb-proto/Manifest b/x11-base/xcb-proto/Manifest
index 73f306c39a6e..66e2fe9a4ef9 100644
--- a/x11-base/xcb-proto/Manifest
+++ b/x11-base/xcb-proto/Manifest
@@ -1,5 +1,3 @@
 DIST xcb-proto-1.15.2.tar.xz 148108 BLAKE2B 0d6cc87ea0d2de594ba11b11255779e90d3c7507f0002453b3d1b2ac73fb604e5ee52e516bbcf76bce2a89027f8c8de6289d21aa2bb23d7d3e2ee77211b54946 SHA512 9d0b2f0a4dbbf2d64e32ff4658d1663e13d7e5f1bffc1e8d45be7b9dd5bab46e29fc1c2f6e66a7a569e374ba6756faf3c39b0b5e5560df6d7f8b68beec97659d
-DIST xcb-proto-1.15.tar.xz 146628 BLAKE2B d7f38f1a415a7c70af372c64726e089ee454ffb981c031e4b8e93f345a1ada9dc40fb4e8b59adf553af8b4d9b7ef52730c9df56a0c24e53f98b3403346c7e810 SHA512 a333ac7c39f17ff2567419d09a9a77210c943a4e88d79eb152d416ae26bf6fb14e2446f9817abc806edd7aa3733bd4de5852b5ae90a25cbcc9d40e59c211aa36
 EBUILD xcb-proto-1.15.2.ebuild 1204 BLAKE2B f356a860a3afb4f50063e96ec0795d2172fd56dccb06ff388e9de9bb98f0a91db47c0538b60c1d058f7336fd568fda2a0f93bb2fb3458f420802e1883a9436b9 SHA512 5332c8529c85832e770745dcda2cffedba354e37423ff220f26b869bd17e89736f2f61efe753d9ac62e9e636849e42da355667f3e4d4307955ec8b9b452141b9
-EBUILD xcb-proto-1.15.ebuild 1274 BLAKE2B dacbfa8fd5b5db71b4820ddb6fc46d77099bce70f0df1415a30302a6447415cf4a96f1efcff27f22e460d6d8603ae171ed66aa26388bd33ba585982379bb9d59 SHA512 ee3bf836c669c92f76acebd8cd7bb29ebbd20ae940aa0ff52c99cd901091ff04311e9d0fcedbd1943dfc7dfb8d95dc8b237b0635933b03c7bcff5d3ca2b963a2
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-base/xcb-proto/xcb-proto-1.15.ebuild b/x11-base/xcb-proto/xcb-proto-1.15.ebuild
deleted file mode 100644
index be888b602cd4..000000000000
--- a/x11-base/xcb-proto/xcb-proto-1.15.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-XORG_TARBALL_SUFFIX="xz"
-XORG_MODULE=proto/
-XORG_MULTILIB=yes
-
-inherit python-r1 xorg-3
-
-DESCRIPTION="X C-language Bindings protocol headers"
-HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/proto/xcbproto"
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
-
-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=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libxml2
-"
-
-ECONF_SOURCE="${S}"
-
-multilib_src_configure() {
-	# Don't use Python to find sitedir here.
-	PYTHON=true default
-}
-
-src_compile() {
-	:
-}
-
-xcbgen_install() {
-	# Use eclass to find sitedir instead.
-	emake -C xcbgen install DESTDIR="${D}" pythondir="$(python_get_sitedir)"
-	python_optimize
-}
-
-multilib_src_install() {
-	# Restrict SUBDIRS to prevent xcbgen with empty sitedir.
-	emake install DESTDIR="${D}" SUBDIRS=src
-	multilib_is_native_abi && python_foreach_impl xcbgen_install
-}
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index fb7ddfa003de..ed676d927a29 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/xf86-input-synaptics/Manifest b/x11-drivers/xf86-input-synaptics/Manifest
index 44996f519b2d..221707838ffb 100644
--- a/x11-drivers/xf86-input-synaptics/Manifest
+++ b/x11-drivers/xf86-input-synaptics/Manifest
@@ -1,5 +1,3 @@
-DIST xf86-input-synaptics-1.9.1.tar.bz2 503722 BLAKE2B 5ff2f792d187ff0f3fabb1ee194f4eae1397d993627ef3a74b1c838cd611fc2834c6453b57d0dc27d7a6e0bc69b717eb1cb76c87833dd1c66b1af5ac824e1d55 SHA512 978eddd456aa7361047bc3d72e5127b24b13de29b0dddb6a0acc9f9da93931baa2b22fb5d1e6be164f629a11e5d97d753b835426435396b45b1af5eb8d546c3f
 DIST xf86-input-synaptics-1.9.2.tar.xz 432380 BLAKE2B 7ba94565f454fff8ddaf33695a7a16526810bf2677ef01e9ae740fd00a95810b4d42fb0077fe93120ac72398ca18ade48c7b389ecbc37f2438beaa97a6a21db5 SHA512 6fd46505f22bba79f612fbd48dddd4818f7d874cc29caac71840744de27f1d224c68861e3a18d2a866b78178924d2f093f5260e27b221aa1fb17dbc09d66b649
-EBUILD xf86-input-synaptics-1.9.1.ebuild 858 BLAKE2B f484b206aa2599219c8105722b08e8523dc2a0045686777d1dc5a39eb8f0d4819411f2124f6d259eee4521fe405658bf65995cb3faa20f9b7c335b2e17ce6226 SHA512 273e65950a76d072c77b59fffc953f1e1027cb7c41a4b40e05a27ae11531371fd61a95b4563d08d837ba5973e76173ecfcf9070330de7e0bc62c2797d0b686de
 EBUILD xf86-input-synaptics-1.9.2.ebuild 900 BLAKE2B 3f3d18be01af3fe6ebdf91c39a1de29879f29f1f7d00d1ff85f8d135a79e928a1ec7fab7b45861e7c661b19a6b50615042282373d4dad0ad9d57a8be8a14a9ce SHA512 832909388377e1c103ee48411e3fb644264f6448cfd9bce7b5d1260c97adbbe8df47d03cd9af595845680c0f8e94cb3345c36bf67ee8445e612cecd58d48e74a
 MISC metadata.xml 235 BLAKE2B 5ed3cd35ac32a5cdd6ac490bafdbc1cd03fc8c6bdbc8194ba7f4a34151a24c4ade7a80705d92348d6d13a9579d18b19ec40a353bf014dc02f98980bfa03d3574 SHA512 3fe78f6dd92b87b30ed02aef15ed72ec5cb62f4c6568dd9b98dcb2f11a4b9ce93955e34c62112a310b4c4a51f87e0e31e31ae5af140e1054c127d3cd344d7267
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.1.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.1.ebuild
deleted file mode 100644
index c92531fc7fa4..000000000000
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info xorg-3
-
-DESCRIPTION="Driver for Synaptics touchpads"
-
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 x86"
-
-RDEPEND="
-	>=x11-base/xorg-server-1.14
-	>=x11-libs/libXi-1.2
-	>=x11-libs/libXtst-1.1.0
-	kernel_linux? ( >=dev-libs/libevdev-0.4 )"
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.37
-	x11-base/xorg-proto"
-
-check_reqs() {
-	linux-info_pkg_setup
-
-	# Just a friendly warning
-	if ! linux_config_exists \
-			|| ! linux_chkconfig_present INPUT_EVDEV; then
-		ewarn
-		ewarn "This driver requires event interface support in your kernel"
-		ewarn "  Device Drivers --->"
-		ewarn "    Input device support --->"
-		ewarn "      <*>     Event interface"
-		ewarn
-	fi
-}
-
-pkg_pretend() {
-	check_reqs
-}
-
-pkg_setup() {
-	check_reqs
-}
diff --git a/x11-drivers/xf86-video-mga/Manifest b/x11-drivers/xf86-video-mga/Manifest
index 70b6e4e9ea43..a4a39d6b4f81 100644
--- a/x11-drivers/xf86-video-mga/Manifest
+++ b/x11-drivers/xf86-video-mga/Manifest
@@ -1,5 +1,3 @@
-DIST xf86-video-mga-2.0.0.tar.bz2 452486 BLAKE2B e3c0d3d6ee3c1651f96fa2353d94d5f9f19ebf97b121a87749fdb8ba6d8d3bf7066c39c454910a2b1ad9d7e3d44dd3c31bbd432490855df4676bd4fcdafe71c9 SHA512 b92006486aef815ff4399f291d610c65d88c0b32a9dae97658c644715ff62b221b01495b5c7a2311745e26f699c1c1f753b81c7bf54cf75567af9f78ac015540
 DIST xf86-video-mga-2.0.1.tar.xz 403212 BLAKE2B 2d7f4422defb0b57fc7f9bb3c27274f51185eac45445f83f1c9bdba1bff3066f05728e9996f13f8cd2d8a7275602dfc5cef7435b54498700a8ce6efae568631c SHA512 d9a0abedb71f3354788c2f91b770bc00c4118cfa2c99072dea82c28f025bc87bb88ebaf969962a8f0e97e1ff7938aebd9c682b730b0e07d5174dd9e8dc2cdfb6
-EBUILD xf86-video-mga-2.0.0.ebuild 365 BLAKE2B 87f704100fd36ac5e3d8a2cc1920216ffb6e5976bfd970248563b030cf2c7bb93c11d3d6f958f719412722d3aef9f84304d50213047025d20707d911941ed152 SHA512 1fd3f39dfb6c1023e5d91757fdf345a85e6eb0d132ee195c7419e920ede08b99103cc1fd0904d78d616d421154c9e6657061a97957d94578a12352f19edba00d
 EBUILD xf86-video-mga-2.0.1.ebuild 364 BLAKE2B 47b979fa83fe43a9733bd2cb66ff5af0b0b678c6196bdf01e9cc2f0eeab59d0bcbd6c3f52d1e04945d172dc0711fb44518c096e3134a00ab0cb9d1ff96b7e5c5 SHA512 dddbcd601236f2054a91beaa6261c414c289b4e38d77de2f339b2e4dd7b19bebd9dffdc1b944e517611f93b2ee56ea0211139415de42786a436259b96b59fc75
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-drivers/xf86-video-mga/xf86-video-mga-2.0.0.ebuild b/x11-drivers/xf86-video-mga/xf86-video-mga-2.0.0.ebuild
deleted file mode 100644
index 69de3ccd4956..000000000000
--- a/x11-drivers/xf86-video-mga/xf86-video-mga-2.0.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_DRI=dri
-inherit xorg-3
-
-DESCRIPTION="Matrox video driver"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~loong ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		$(use_enable dri)
-	)
-	xorg-3_src_configure
-}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index cc9d362f25cc..a368fc1ceeca 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index e9f1caf30a6e..ba3e2cab103a 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,6 +1,4 @@
-DIST libdrm-2.4.111.tar.xz 447388 BLAKE2B bd1fe6a1af3dbdd542ea9d3b887121d917c11ef9c3c0074bbe5d18ffd15050e2df63c744aa5e559e7f8a1f1e9561d3b2ba8b9a45ad72d7c1e6393b7eae99cf54 SHA512 17e92e9e4ded8031ac222764bed7e9ff430a1a377f5e435f6b62b4a7f45cb4c4b769b3b79fbcba11512c1ac973abf8cdcca8e0b9659ae095e915d3d5efcf5516
 DIST libdrm-2.4.112.tar.xz 451872 BLAKE2B a41cbd714e169edd8c6bc6bba5cec8a7a703f553665575c35f43909e2927ed3c1652ddba25b98e63974f0734ca26e818e6ee75613159eb68ea85ba45934df393 SHA512 df8a207d9cce220ee2cf67877eda65394733fbfd0ff85fdbadb2b20ba9bacc41421b32452506c8caecddaf8361564ca68cd6c74d4faf3b1569ab30a3243e4340
-EBUILD libdrm-2.4.111.ebuild 1942 BLAKE2B ce7a3fcd053b207c2c78f20667bf9264d7b5c0f75039fcc49f2b771660eb913307462c35b094ff2b309eaf4e0a658ce68fadce94cb091bb8e07ada1342c769bb SHA512 5f7a642ce1571333d431558af4824ce604463e41f5e031e54c24063f8dc0ed8083875bbdab6fd429e32cf3864726c89505b587546c64d3589c4d0de89456f486
 EBUILD libdrm-2.4.112.ebuild 1942 BLAKE2B ce7a3fcd053b207c2c78f20667bf9264d7b5c0f75039fcc49f2b771660eb913307462c35b094ff2b309eaf4e0a658ce68fadce94cb091bb8e07ada1342c769bb SHA512 5f7a642ce1571333d431558af4824ce604463e41f5e031e54c24063f8dc0ed8083875bbdab6fd429e32cf3864726c89505b587546c64d3589c4d0de89456f486
 EBUILD libdrm-9999.ebuild 1950 BLAKE2B d892aa28a9055968915a2eb329ca9ac49bbcaec0ae4f417f46d7fcf0641c2ee95086d8b09d3b433b0d07e452db95951f8c80e0ec8466fbdbbe03a60459a0652d SHA512 a2f387299e8d2446a63efb5f7c80061414143dfe8dde9216c7d6f3d9a6f50e1820f97f27fa7d5977d84b0f83e5119e06c0eddd2e290b773f730744160538fa2b
 MISC metadata.xml 304 BLAKE2B e47f11b45b5c90804d5dfd27dbe2f2156099661ac7546152fb4e62046fd030838a0944d7dea35efd2f7b527eb88992c5049a40282dea58097b991c6bcd843693 SHA512 b798cffebaf330272494b6ef84c9c587a920e27ac0ae26336ff256de21768274cfcbe8feb61b7f63bff52294e460f945ada9ab9ddaeaea91d17bc1d6d41360da
diff --git a/x11-libs/libdrm/libdrm-2.4.111.ebuild b/x11-libs/libdrm/libdrm-2.4.111.ebuild
deleted file mode 100644
index 25b15697e55f..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.111.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
-PYTHON_COMPAT=( python3_{8..11} )
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} python-any-r1 meson-multilib
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS} valgrind"
-RESTRICT="test" # see bug #236845
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')"
-
-python_check_deps() {
-	has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		# Udev is only used by tests now.
-		-Dudev=false
-		-Dcairo-tests=false
-		$(meson_use video_cards_amdgpu amdgpu)
-		$(meson_use video_cards_exynos exynos)
-		$(meson_use video_cards_freedreno freedreno)
-		$(meson_use video_cards_intel intel)
-		$(meson_use video_cards_nouveau nouveau)
-		$(meson_use video_cards_omap omap)
-		$(meson_use video_cards_radeon radeon)
-		$(meson_use video_cards_tegra tegra)
-		$(meson_use video_cards_vc4 vc4)
-		$(meson_use video_cards_vivante etnaviv)
-		$(meson_use video_cards_vmware vmwgfx)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		-Dvalgrind=$(usex valgrind auto false)
-	)
-	meson_src_configure
-}
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index 45cdf7d08e95..0433e684cf86 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,4 +1,3 @@
 DIST libxcb-1.15.tar.xz 446492 BLAKE2B d50146ee9b822dfd0c24513110e1706cda05ce588f276005167a911d3097275f36be1ce755c42c2b2970e750f10b2b943f3e373b6e55865fba986e29811a3545 SHA512 f6c7d766b7cf9cab6abe948ee424cbae6951dbfe2f76fa58a109cdc05b0f0919dcc4e38176a22ff4b95fc1e38596115317e32ba33b24cae0035a4e30dbcbdad9
 EBUILD libxcb-1.15-r1.ebuild 1410 BLAKE2B 3621a58ae286a9966404e238d9503f3f666ee27220865cbf1b7db7d343dfd4647fc1a15e0e34b55f3342766033d9eb74859df884be37e84e367aa9ff63f337ec SHA512 b5228b34a0f3422043521b4f23a989835c145a097719d00d1a7142796d6b304896df8b6df42884f4d382da2fee6d086c5a119828bd064fd9afcd4771afa2eef1
-EBUILD libxcb-1.15.ebuild 1419 BLAKE2B f3cbdfdb4e2e6033dc98dbad1a4a99bca3ced8d444044023bf9f0205d1ab6270c2cb4738aeec1c6654aa96fe9929ab7defd5ad6553b5419bb34b8a1fbeaba1da SHA512 bdac2c0d046ec98dc990a6312f867a413dbff5bde21563e0845bb8d79de5446ebd0f9c9a69ebc2248114920703de5d2af79ce8c292b85e26c4ccda8cf31107ee
 MISC metadata.xml 401 BLAKE2B 67d85ae2c4ac6eecb10245666173d96f896ec9eddc36c8d0890092cbd19c7dd685f327332235937afbb119fa6e69860920fc1e385fdc750d89c85b67a9fbaa20 SHA512 72981a4b87a9219573847178c3d50f9a182c0b0a82917d3d472be062a5bb5e21422bc1776a8988b0ff0a5248a6f5eabe3dee3aa51612b31a7da283fd870b58ab
diff --git a/x11-libs/libxcb/libxcb-1.15.ebuild b/x11-libs/libxcb/libxcb-1.15.ebuild
deleted file mode 100644
index 4a9b2b45b944..000000000000
--- a/x11-libs/libxcb/libxcb-1.15.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE=xml
-
-XORG_TARBALL_SUFFIX="xz"
-XORG_MULTILIB=yes
-XORG_DOC=doc
-
-inherit python-any-r1 xorg-3
-
-DESCRIPTION="X C-language Bindings library"
-HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb"
-
-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="doc selinux test +xkb"
-RESTRICT="!test? ( test )"
-SLOT="0/1.12"
-
-RDEPEND="
-	>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	>=x11-base/xcb-proto-1.15[${MULTILIB_USEDEP}]
-	elibc_Darwin? ( dev-libs/libpthread-stubs )
-	test? ( dev-libs/check[${MULTILIB_USEDEP}] )
-"
-# Note: ${PYTHON_USEDEP} needs to go verbatim
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '>=x11-base/xcb-proto-1.15[${PYTHON_USEDEP}]')
-	doc? ( app-doc/doxygen[dot] )
-	test? ( dev-libs/libxslt )
-"
-
-python_check_deps() {
-	has_version -b ">=x11-base/xcb-proto-1.15[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	xorg-3_pkg_setup
-}
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc devel-docs)
-		$(use_enable selinux)
-	)
-	xorg-3_src_configure
-}
diff --git a/x11-libs/libxcvt/Manifest b/x11-libs/libxcvt/Manifest
index ef3355a56f01..102e72265167 100644
--- a/x11-libs/libxcvt/Manifest
+++ b/x11-libs/libxcvt/Manifest
@@ -1,6 +1,4 @@
-DIST libxcvt-0.1.1.tar.xz 9600 BLAKE2B 47628fc10d9d75207b7d09cb5b789e58fae485c95a5e3e95345c289f0eeb20859dff6384049e22532ddcb3c04a84ceca6557c3490e5cd8c6956c6ac6c81d6636 SHA512 50e9cd0283858823d4cfde75f06e23ffc42983272cb1f75408052fb5b76a4bb6f9de7d42d8ff9ec0dae6e95eefebc6273e03c919a92f237585db55eaf1a57005
 DIST libxcvt-0.1.2.tar.xz 9648 BLAKE2B 8a4803eb6790fd0ea1520fd31e335f7a363c3606e74837a959453be8819ce0d450af7bb651887a891aa657a5eeac3e4983041060fa5c87b1238c83354e425de7 SHA512 3f6b2baca712a4608780686932f8881255c07bb74b1a788f9b07d4e22975c038d75111cd6b452257882a0b2bad57eebb2002f80a3e435d2e2d16936597f039b0
-EBUILD libxcvt-0.1.1.ebuild 447 BLAKE2B 5aef8156e2edf6210a9348f78096f55bc7052e946df0f63cdf6345b2faef9bdde4e6957bd7a79063d5ea6d7139783cda8f8be5fe3486a58c52f7d6c2d2acb538 SHA512 10f5f3e0ae3a3f5d6d97734693c37f28caddc39c5c2995c0702de095ec255dafdef84b0f0ca097873589f13095449efd76bd885c3a7ce8092d098f2bcf4895f9
 EBUILD libxcvt-0.1.2.ebuild 447 BLAKE2B cab186971614c8f5d4d8c05cd5cf2bbc300beec95b4db64a48296a54e813a2385a2ccc9c659c049072d913e2cd0e5c00e252396b020843e6bf8259e5aa8ec6a6 SHA512 d62d09422c1591409978aee7f281c4ecb23bf5b9d723140b08964bbd805bef7978c150bc6a9cd0cacee312456b89ef61dce6c41c62cad76d98b073d9c202896b
 EBUILD libxcvt-9999.ebuild 455 BLAKE2B 914a44404e7dd3eff5efaf2e0ad19f3a55b6f411b55adce6656c21b9af6973a3b2ae37f392d6d6ee4ccd74ecf630da95a291f7cd558c7c4ffecfc34c662b52a7 SHA512 79d158e1d12b275ba7a2d9e98544e7976b28ddb84da256cd393930c665a197501e2b2fbc61c9d365de07c3537463cfba98e801f4d895e2c45ad1e6ab672bec4e
 MISC metadata.xml 235 BLAKE2B 5ed3cd35ac32a5cdd6ac490bafdbc1cd03fc8c6bdbc8194ba7f4a34151a24c4ade7a80705d92348d6d13a9579d18b19ec40a353bf014dc02f98980bfa03d3574 SHA512 3fe78f6dd92b87b30ed02aef15ed72ec5cb62f4c6568dd9b98dcb2f11a4b9ce93955e34c62112a310b4c4a51f87e0e31e31ae5af140e1054c127d3cd344d7267
diff --git a/x11-libs/libxcvt/libxcvt-0.1.1.ebuild b/x11-libs/libxcvt/libxcvt-0.1.1.ebuild
deleted file mode 100644
index 77be4c7c0986..000000000000
--- a/x11-libs/libxcvt/libxcvt-0.1.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-XORG_TARBALL_SUFFIX="xz"
-
-inherit xorg-3 meson
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-DESCRIPTION="X.Org xcvt library and cvt program"
-
-RDEPEND="!<x11-base/xorg-server-1.20.11-r3"
-
-# Override xorg-3's src_prepare
-src_prepare() {
-	default
-}
diff --git a/x11-libs/xcb-util-cursor/Manifest b/x11-libs/xcb-util-cursor/Manifest
index d82216182c63..b540f178bc8c 100644
--- a/x11-libs/xcb-util-cursor/Manifest
+++ b/x11-libs/xcb-util-cursor/Manifest
@@ -1,4 +1,3 @@
 DIST xcb-util-cursor-0.1.3.tar.bz2 295224 BLAKE2B 7a1a89c0f326f4ac0768110c4aa5a7818ddace1f231f6a0dcfacaf8b157a2d6aae53f5278a02cb945822d83eccb8a01ebb14ab98e8828d8f1d506e42f51431ba SHA512 be5eee7b268b18f356d6aae04820a7e1c51397dac9020d876df379e833200255b5194269541c245a9b4ac286edad4cfe44dae8e4fcfd16a4726dd7553c104c21
-EBUILD xcb-util-cursor-0.1.3-r3.ebuild 1045 BLAKE2B 93f1f3b11db5d69d42445f160c0e41540101f5e3c98368a35dcce1d0a164d410b17f8ded853a07ccbf995ec8c96dec7a137061ea643b8450e19ecf533d902800 SHA512 833070ad90a01aae0ee93a970157a9746b9b85e936b3085cec744d6ec8edb48a766fa972a7c6ac37db49fafd8bb2f5944d98f922c9d99247c7e630b4358aedaa
 EBUILD xcb-util-cursor-0.1.3-r4.ebuild 1025 BLAKE2B e1cee4ee659ea5ecdf9c3d315e1c7fa0ee4c2593353524a7de929031fc629b3030a1ce2f9998e9d6dfcf1335e9adf9b7cb6db28aa8e01e20bf45263933237a3a SHA512 7c2ba922ab6841a56c63ae67003bc962cf0b3ccdb76896f76b269c7d2c89464da6d2a6c1c183bf0828a706c884eb46f99af6e8deb1080a775559d62580fe673b
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r3.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r3.ebuild
deleted file mode 100644
index b66f6357857a..000000000000
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X C-language Bindings sample implementations"
-HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
-
-RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-renderutil-0.3.9[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=x11-base/xcb-proto-1.8-r3:=[${MULTILIB_USEDEP}]
-	x11-base/xorg-proto"
-BDEPEND=">=dev-util/gperf-3.0.1"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-cursorpath='~/.cursors:~/.icons:/usr/local/share/cursors/xorg-x11:/usr/local/share/cursors:/usr/local/share/icons:/usr/local/share/pixmaps:/usr/share/cursors/xorg-x11:/usr/share/cursors:/usr/share/pixmaps/xorg-x11:/usr/share/icons:/usr/share/pixmaps'
-)
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 093e85cda973..18e33da19b73 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest
index 64e825982d8e..0383c088c236 100644
--- a/x11-misc/compose-tables/Manifest
+++ b/x11-misc/compose-tables/Manifest
@@ -1,5 +1,3 @@
-DIST libX11-1.7.5.tar.xz 1853152 BLAKE2B 95ceccbfd37d8a749a533bdc03feba94236a47185a2cd7ad6592c534c17636906b735aa5800d810d13d3e342e3dbe281bb1f1f3ecab9d07e6a6a50f33beef8af SHA512 ef33e2f631226cab27657f46e1fd4cfc928f62f928d8297474e7b993017c8f92b60272eed6515990cdf3a9d34581837b7a3896e584f3546dd26f3790034df347
 DIST libX11-1.8.1.tar.xz 1818460 BLAKE2B 7602b4d8c65ea3160f81096b4e022b5462e49d96b36dee70fe06e972329dc9d70bbd462e2079da03ba5647d7a72bf03e29aab23c60bcc206c95d770655622226 SHA512 2e36d2c47519e0cb2697f588c0ccdf73fbe75c2163f0855c78f7052dc9e920bca081f9d5e39c707a14067f101faef74fc758c8862eeba675b1535b43119d533a
-EBUILD compose-tables-1.7.5.ebuild 943 BLAKE2B 859cec003f23b043e2271eab3aa31a01ee8ff66a7a78749ced99ff98d09eeb085497fe799138d5efa2a30f83f1097305a90ffa7caccf47bffbdfed72faa29e48 SHA512 2355bba44c7af1937aea4cc68248a96e38f9fd6188d85da7a755e344f4e3add63ae19db03409703b103ebb5045401b621a4258866ead6c79fbd1fb78f9e1e9a4
 EBUILD compose-tables-1.8.1.ebuild 950 BLAKE2B d39d76e922dff015b083428ebc78d9201df0aeb3201e3c23c9341f3e4506aefec860bc89a0c08c211868058cd43360f1243f3800c8394d6d3708d82ee37a77fd SHA512 d64b4c63a117b55f4f7e7b026122fe64feb0bb30edaa0f7f2399343745da05899f19bc2f7561454c98bde2b30cfdd54d3a58c2689f12785d7cdda352c761d2e2
 MISC metadata.xml 312 BLAKE2B 297d68d5585ee7fe053a0b9d1e4758d1c8538fbfa6037cddfefa84f5b757c1c768d4ab072f6198e19c1b9bf4d21120440db61e5a9690cc6cfd387ee9d2add736 SHA512 4b5fc7ba8a7c24241e7ab5dd68677ccba15f5e89a76482679f18139faea4ff1555759066041afbf51c65d1870ec0d999a772c340f1e934a6aba0135b8da28d18
diff --git a/x11-misc/compose-tables/compose-tables-1.7.5.ebuild b/x11-misc/compose-tables/compose-tables-1.7.5.ebuild
deleted file mode 100644
index 884e98ec6339..000000000000
--- a/x11-misc/compose-tables/compose-tables-1.7.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_MULTILIB=no
-XORG_TARBALL_SUFFIX=xz
-inherit xorg-3
-
-# Note: please bump this with x11-libs/libX11
-DESCRIPTION="X.Org Compose Key tables from libX11"
-# xorg-3.eclass would attempt to fetch a tarball with a matching name to this package
-SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
-S="${WORKDIR}/libX11-${PV}/"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-# Only needed by configure
-DEPEND="
-	x11-base/xorg-proto
-	>=x11-libs/libxcb-1.11.1
-	x11-libs/xtrans"
-RDEPEND="!<x11-libs/libX11-1.7.0"
-
-XORG_CONFIGURE_OPTIONS=(
-	--without-xmlto
-	--without-fop
-	--disable-specs
-	--disable-xkb
-)
-
-src_compile() {
-	emake -C nls
-}
-
-src_test() {
-	:;
-}
-
-src_install() {
-	emake DESTDIR="${D}" -C nls install
-}
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 916043c80e68..a37d2cde65dc 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest
index fb8468f32ce7..ba2dc9a4ad01 100644
--- a/x11-terms/mlterm/Manifest
+++ b/x11-terms/mlterm/Manifest
@@ -1,6 +1,4 @@
 AUX mlterm-font.patch 606 BLAKE2B 5d9989a2656a0375e79c189db88167f443c3f7ee6f7f8b83972b65cc59b455fcb2c2ee6c4a25c82bb48cb2610d7453a5552b0eb5a17bd80eed947418a038b252 SHA512 60e625e554341feda77a926f3a59c4858ab19a810eeba39810701c429a504666643e1a614586b88379fe2d42606865f0afa8da6c14c1499a52aa1200e8bd5c4a
-DIST mlterm-3.9.1.tar.gz 4175186 BLAKE2B 030d9144e7c835c895269fd19f89ece7c0dae9ca3f1d4425a1d409b9ac78a530431a4e05ef685d178748a35f9fae77414286a38a412a0496433b8324a22a73dd SHA512 1337b884971b2c4c2c3140388f07927101a947b0268f547611f4f4ece49c8d0954c068789ee7c92c82db114021c77c08416db30233149c8964e827ab901cc870
 DIST mlterm-3.9.2.tar.gz 4259208 BLAKE2B 161d496326abd58e8dabedd4c49e0e17ade77956fd0be6f450d5adf2953fe04a2c62a40d3694296d12cdea1274410e17a64cc62f88b953d894cce216425b29f3 SHA512 3076dafbc98a01738d88acf0e0f52e15d33862b3e9b7a851a4496f1be07ee9e51103daf7842954bcae1f1ba62bd6645b0bd60af7f66ee98721bdf3786b9fcbaf
-EBUILD mlterm-3.9.1-r2.ebuild 2973 BLAKE2B cf51084e396f0979293a1f685053b9d8c26851ee1ba4b60793eaa4c09f928e931a8014461884002a0d31fe4559f48560184d37ff588b7de87e5e6b77fa696ab8 SHA512 343b9295a3d186d7a276ca5cbd63a17b416308ddfdb607565784f565f97505c5f69746d4677cdeb5848118947d63f03b87b57ba9f13d01680da6990c13cc8aa8
-EBUILD mlterm-3.9.2.ebuild 2981 BLAKE2B 862dc0efbda5fdd27434ba01a10a1bfdff1f6ca5e6d3677175755f502563a54eae53aeb0071d6bf088827334e5e701941fc287dc1250b565e7fbabd6ec2c269d SHA512 8440c20fe8915a0834473bea6678f2403a7be666896530dd1ac633f2731cc639e479061faa77c9f3e9250742408ed7a2f5dd8ec8664c25fa499e0a6024f95e9f
+EBUILD mlterm-3.9.2.ebuild 2980 BLAKE2B be6236f65bcb739ff477476586aa34eba1eebda0a7541cb53dab64f5115c0fe9bc86f079bb89a3ddb2cbd8f083c7940ae8d96df65478ef7c7bdd735a6b41b157 SHA512 ce2232186b250af4f1b1be0a30623a45efa2ecf95995dc5db68e3996ec53ecf816588e852e8fd2c5cd92a425ddff040b027e2d500d0cabf264ec57f21d516d9b
 MISC metadata.xml 1173 BLAKE2B 25a60316724dfd2c4738d7dd94a39e72888a373ba74c43c7e7c13abc1f492e58a04c9f537074567784e5bed66b5daf704813e23c1a22104cea636fa0a15bbbe4 SHA512 17b693aa9a6f0e6e4c8a6e025d1137164536cdbc2142faf6ce50edce139644463882340dd47c262d804e6087e0a6223c8185120483648edec8064738a204982e
diff --git a/x11-terms/mlterm/mlterm-3.9.1-r2.ebuild b/x11-terms/mlterm/mlterm-3.9.1-r2.ebuild
deleted file mode 100644
index 80652a1c4df1..000000000000
--- a/x11-terms/mlterm/mlterm-3.9.1-r2.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit desktop
-
-DESCRIPTION="A multi-lingual terminal emulator"
-HOMEPAGE="http://mlterm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="+X bidi brltty cairo debug fbcon fcitx freewnn gtk harfbuzz ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter wayland xft"
-REQUIRED_USE="|| ( X fbcon wayland )"
-
-RDEPEND="virtual/libcrypt:=
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-	)
-	bidi? ( dev-libs/fribidi )
-	brltty? ( app-accessibility/brltty )
-	cairo? ( x11-libs/cairo[X(+)] )
-	fbcon? ( media-fonts/unifont )
-	fcitx? ( app-i18n/fcitx )
-	freewnn? ( app-i18n/freewnn )
-	gtk? ( x11-libs/gtk+:3 )
-	harfbuzz? ( media-libs/harfbuzz[truetype(+)] )
-	ibus? ( app-i18n/ibus )
-	libssh2? ( net-libs/libssh2 )
-	m17n-lib? ( dev-libs/m17n-lib )
-	nls? ( virtual/libintl )
-	regis? (
-		|| (
-			media-libs/sdl-ttf
-			media-libs/sdl2-ttf
-		)
-	)
-	scim? ( app-i18n/scim )
-	skk? (
-		|| (
-			virtual/skkserv
-			app-i18n/skk-jisyo
-		)
-	)
-	uim? ( app-i18n/uim )
-	utempter? ( sys-libs/libutempter )
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)
-	xft? ( x11-libs/libXft )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=( "${FILESDIR}"/${PN}-font.patch )
-DOCS=( doc/{en,ja} )
-
-src_prepare() {
-	# default config
-	sed -i \
-		-e "/ icon_path =/aicon_path = ${EPREFIX}/usr/share/pixmaps/${PN}-icon.svg" \
-		-e "/ scrollbar_view_name =/ascrollbar_view_name = sample" \
-		etc/main
-
-	default
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable bidi fribidi)
-		$(use_enable brltty brlapi)
-		$(use_enable debug)
-		$(use_enable fcitx)
-		$(use_enable freewnn wnn)
-		$(use_enable harfbuzz otl)
-		$(use_enable ibus)
-		$(use_enable libssh2 ssh2)
-		$(use_enable m17n-lib m17nlib)
-		$(use_enable nls)
-		$(use_enable scim)
-		$(use_enable skk)
-		$(use_enable uim)
-		$(use_with X x)
-		--with-gui=$(usex X "xlib" "")$(usex fbcon ",fb" "")$(usex wayland ",wayland" "")
-		--with-type-engines=xcore$(usex xft ",xft" "")$(usex cairo ",cairo" "")
-		--with-utmp=$(usex utempter utempter none)
-		--enable-optimize-redrawing
-		--enable-vt52
-		--disable-canna
-		--disable-static
-	)
-
-	local scrollbars="sample,extra"
-	local tools="mlclient,mlcc,mlfc,mlmenu,${PN}-zoom"
-	if use gtk; then
-		myconf+=(
-			--with-gtk=3.0
-			--with-imagelib=gdk-pixbuf
-		)
-		scrollbars+=",pixmap_engine"
-		tools+=",mlconfig,mlimgloader"
-	else
-		myconf+=( --without-gtk )
-	fi
-	if use regis; then
-		tools+=",registobmp"
-	fi
-	myconf+=( --with-scrollbars="${scrollbars}" )
-	myconf+=( --with-tools="${tools}" )
-
-	addpredict /dev/ptmx
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	:
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	docinto contrib/icon
-	dodoc contrib/icon/README
-
-	doicon contrib/icon/${PN}*
-	make_desktop_entry ${PN} ${PN} ${PN}-icon "System;TerminalEmulator"
-}
diff --git a/x11-terms/mlterm/mlterm-3.9.2.ebuild b/x11-terms/mlterm/mlterm-3.9.2.ebuild
index a6d99ca57e75..e0c765700c4f 100644
--- a/x11-terms/mlterm/mlterm-3.9.2.ebuild
+++ b/x11-terms/mlterm/mlterm-3.9.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 IUSE="+X bidi brltty cairo debug fbcon fcitx freewnn gtk harfbuzz ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter wayland xft"
 REQUIRED_USE="|| ( X fbcon wayland )"
 
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 5e826463cbc4..01dae50fd0a0 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/gentoo-xcursors/Manifest b/x11-themes/gentoo-xcursors/Manifest
index 08f25b058ff3..6c67208e7d5e 100644
--- a/x11-themes/gentoo-xcursors/Manifest
+++ b/x11-themes/gentoo-xcursors/Manifest
@@ -1,4 +1,3 @@
 DIST gentoo-xcursors-0.3.2.tar.gz 2035025 BLAKE2B 520dbb3f8fe77bc915bb60c81f2abf4fce1ee6fb349ae5064ff5d2fa10c0af7ba2dd00dc0b36f992c96169214c4ebd28dceb1ba069e638e5efab7088ba804fe6 SHA512 5ccbd2e8be7bda4da0578c5a08d967dded9dc4c9163eb96f629c0eaa548f2e46e85f7301de44d5be707cc63a988b925c9c222863da5bac9095dc5170ca9c4aea
-EBUILD gentoo-xcursors-0.3.2-r1.ebuild 1440 BLAKE2B a9b4bf070791fdec7be4d8966b63893807d8cea13eb2f6c0c542869185ec1b74cd00315d5423683b44e4edbe47fe75f48364da8e4048991e8104b951e144c964 SHA512 095534b14414735d5490862eb8224c48b06a729c691d040745cde1787bf99474d9653f148aad2bb2f57501919fedc757d0db018c605ce52578cb771422957c91
 EBUILD gentoo-xcursors-0.3.2-r3.ebuild 1653 BLAKE2B 9f37193b8ed4d72b858089d66a8ae791592dd6268d949577211c7e1f841cc89ff5055bc7fa0b90ff7886687ced44bf3302cb8f0df2a04a1e728432a29903384c SHA512 14770bd8f7851a033169a27dca81e2a31c8b52930f99a9f1ee90ba596ffea6e548a65c1ecf0143cae499cac8aa269def4211e4937e28316ccf3c59c7d49d0807
 MISC metadata.xml 625 BLAKE2B a8b1dcb3b123b3ac1131ef60c143b3adf94d1459c6cd00a5d4e56e83f7701f6842838802cea3c7f53cb4105ba0b20a828fd8ee06fa0a93e0ccc3764c2ef53525 SHA512 b80de950edb24625458aeabf9dabb3567306f202f63dc0cdab77b30d80652f833412aab92f3d7e314486d6bcbc823e36fc2718c30293e1e8d704c58593258787
diff --git a/x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.2-r1.ebuild b/x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.2-r1.ebuild
deleted file mode 100644
index f13b85327b3b..000000000000
--- a/x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.2-r1.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
-
-DESCRIPTION="A high quality set of animated mouse cursors"
-HOMEPAGE="https://schlomp.space/tastytea/gentoo-xcursors"
-SRC_URI="https://schlomp.space/tastytea/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-
-RDEPEND="x11-libs/libXcursor"
-
-src_install() {
-	insinto /usr/share/cursors/xorg-x11
-	doins -r cursors/*
-}
-
-pkg_postinst() {
-	einfo "To use this set of cursors, edit or create the file ~/.Xdefaults"
-	einfo "and add the following line (for example):"
-	einfo "Xcursor.theme: gentoo"
-	einfo ""
-	einfo "You can change the size by adding a line like:"
-	einfo "Xcursor.size: 48"
-	einfo ""
-	einfo "Also, to globally use this set of mouse cursors edit the file:"
-	einfo "   /usr/local/share/cursors/xorg-x11/default/index.theme"
-	einfo "and change the line:"
-	einfo "    Inherits=[current setting]"
-	einfo "to (for example)"
-	einfo "    Inherits=gentoo"
-	einfo ""
-	einfo "Note this will be overruled by a user's ~/.Xdefaults file."
-	einfo ""
-	ewarn "If you experience flickering, try setting the following line in"
-	ewarn ""
-	ewarn "the Device section of your xorg.conf file:"
-	ewarn "    Option  \"HWCursor\"  \"false\""
-	einfo ""
-	einfo "The three sets installed are gentoo, gentoo-silver and gentoo-blue."
-}